mirror of
https://github.com/morgan9e/helium
synced 2026-04-15 00:44:06 +09:00
Update to Chromium 140.0.7339.185
This commit is contained in:
@@ -1 +1 @@
|
||||
140.0.7339.132
|
||||
140.0.7339.185
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
extension_misc::kAssessmentAssistantExtensionId,
|
||||
--- a/chrome/browser/extensions/component_loader.cc
|
||||
+++ b/chrome/browser/extensions/component_loader.cc
|
||||
@@ -415,11 +415,6 @@ void ComponentLoader::AddWebStoreApp() {
|
||||
@@ -422,11 +422,6 @@ void ComponentLoader::AddWebStoreApp() {
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1935,7 +1935,7 @@
|
||||
|
||||
--- a/components/enterprise/browser/reporting/report_util.cc
|
||||
+++ b/components/enterprise/browser/reporting/report_util.cc
|
||||
@@ -80,25 +80,6 @@ em::SettingValue TranslateSettingValue(
|
||||
@@ -79,25 +79,6 @@ em::SettingValue TranslateSettingValue(
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1961,7 +1961,7 @@
|
||||
em::ProfileSignalsReport::RealtimeUrlCheckMode TranslateRealtimeUrlCheckMode(
|
||||
enterprise_connectors::EnterpriseRealTimeUrlCheckMode mode) {
|
||||
switch (mode) {
|
||||
@@ -111,18 +92,6 @@ em::ProfileSignalsReport::RealtimeUrlChe
|
||||
@@ -110,18 +91,6 @@ em::ProfileSignalsReport::RealtimeUrlChe
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1982,7 +1982,7 @@
|
||||
device_signals::AvProduct av_product) {
|
||||
--- a/components/enterprise/browser/reporting/report_util.h
|
||||
+++ b/components/enterprise/browser/reporting/report_util.h
|
||||
@@ -19,17 +19,10 @@ std::string ObfuscateFilePath(const std:
|
||||
@@ -23,17 +23,10 @@ std::string ObfuscateFilePath(const std:
|
||||
enterprise_management::SettingValue TranslateSettingValue(
|
||||
device_signals::SettingValue setting_value);
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
"//third_party/widevine/cdm:headers",
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -183,6 +183,7 @@
|
||||
@@ -184,6 +184,7 @@
|
||||
#include "components/translate/core/common/translate_util.h"
|
||||
#include "components/trusted_vault/features.h"
|
||||
#include "components/ui_devtools/switches.h"
|
||||
|
||||
@@ -102,7 +102,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -2657,6 +2657,10 @@ const char kMantisFeatureKeyDescription[
|
||||
@@ -2661,6 +2661,10 @@ const char kMantisFeatureKeyDescription[
|
||||
"Feature key to use the Mantis feature on ChromeOS.";
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
@@ -115,7 +115,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
const char kMediaRouterCastAllowAllIPsDescription[] =
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -1548,6 +1548,9 @@ extern const char kMantisFeatureKeyName[
|
||||
@@ -1551,6 +1551,9 @@ extern const char kMantisFeatureKeyName[
|
||||
extern const char kMantisFeatureKeyDescription[];
|
||||
#endif // IS_CHROMEOS
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/debug/alias.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/i18n/rtl.h"
|
||||
@@ -754,6 +755,13 @@ void Tab::HideHover(TabStyle::HideHoverS
|
||||
@@ -761,6 +762,13 @@ void Tab::HideHover(TabStyle::HideHoverS
|
||||
DeprecatedLayoutImmediately();
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
base::FeatureList::IsEnabled(
|
||||
--- a/chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -5148,6 +5148,7 @@ void BrowserView::AddedToWidget() {
|
||||
@@ -5159,6 +5159,7 @@ void BrowserView::AddedToWidget() {
|
||||
|
||||
toolbar_->Init();
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/tabs/tab.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab.cc
|
||||
@@ -1163,7 +1163,11 @@ void Tab::UpdateIconVisibility() {
|
||||
@@ -1170,7 +1170,11 @@ void Tab::UpdateIconVisibility() {
|
||||
// Close button is shown on active tabs regardless of the size.
|
||||
showing_close_button_ = true;
|
||||
#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
showing_alert_indicator_ =
|
||||
has_alert_icon && alert_icon_width <= available_width;
|
||||
@@ -1192,6 +1196,8 @@ void Tab::UpdateIconVisibility() {
|
||||
@@ -1199,6 +1203,8 @@ void Tab::UpdateIconVisibility() {
|
||||
!controller_->IsLockedForOnTask() &&
|
||||
#endif
|
||||
large_enough_for_close_button;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4929,10 +4929,12 @@ constexpr char kWebiumFlag[] = "webium";
|
||||
@@ -4930,10 +4930,12 @@ constexpr char kWebiumFlag[] = "webium";
|
||||
#include "chrome/browser/ungoogled_flag_choices.h"
|
||||
#include "chrome/browser/bromite_flag_choices.h"
|
||||
#include "chrome/browser/ungoogled_platform_flag_choices.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4925,7 +4925,13 @@ constexpr char kWebiumFlag[] = "webium";
|
||||
@@ -4926,7 +4926,13 @@ constexpr char kWebiumFlag[] = "webium";
|
||||
// calculate and verify checksum.
|
||||
//
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
|
||||
Reference in New Issue
Block a user