mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 125.0.6422.14
This commit is contained in:
@@ -7,5 +7,6 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/125.0.6422.0'
|
'chromium_checkout': 'refs/tags/125.0.6422.14',
|
||||||
|
'depot_tools_checkout': '4246ba023a'
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||||
index 70c3930b4d357..f71d0ff5bd9a7 100644
|
index df3456f3a4b38..7ef1e33807cd9 100644
|
||||||
--- chrome/browser/BUILD.gn
|
--- chrome/browser/BUILD.gn
|
||||||
+++ chrome/browser/BUILD.gn
|
+++ chrome/browser/BUILD.gn
|
||||||
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
||||||
@@ -18,7 +18,7 @@ index 70c3930b4d357..f71d0ff5bd9a7 100644
|
|||||||
"//chrome:extra_resources",
|
"//chrome:extra_resources",
|
||||||
"//chrome:resources",
|
"//chrome:resources",
|
||||||
"//chrome:strings",
|
"//chrome:strings",
|
||||||
@@ -2759,6 +2761,10 @@ static_library("browser") {
|
@@ -2760,6 +2762,10 @@ static_library("browser") {
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
|
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
|
||||||
index c09a805c4ed7b..de89b16690593 100644
|
index 33c74865672bd..1640fe7378666 100644
|
||||||
--- chrome/app/chrome_main_delegate.cc
|
--- chrome/app/chrome_main_delegate.cc
|
||||||
+++ chrome/app/chrome_main_delegate.cc
|
+++ chrome/app/chrome_main_delegate.cc
|
||||||
@@ -37,6 +37,7 @@
|
@@ -37,6 +37,7 @@
|
||||||
@@ -40,7 +40,7 @@ index c09a805c4ed7b..de89b16690593 100644
|
|||||||
// In the case the process is not the singleton process, the uninstall tasks
|
// In the case the process is not the singleton process, the uninstall tasks
|
||||||
// need to be executed here. A window will be displayed asking to close all
|
// need to be executed here. A window will be displayed asking to close all
|
||||||
// running instances.
|
// running instances.
|
||||||
@@ -1069,7 +1077,8 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
|
@@ -1061,7 +1069,8 @@ std::optional<int> ChromeMainDelegate::PostEarlyInitialization(
|
||||||
|
|
||||||
if (base::FeatureList::IsEnabled(
|
if (base::FeatureList::IsEnabled(
|
||||||
features::kWriteBasicSystemProfileToPersistentHistogramsFile)) {
|
features::kWriteBasicSystemProfileToPersistentHistogramsFile)) {
|
||||||
@@ -50,7 +50,7 @@ index c09a805c4ed7b..de89b16690593 100644
|
|||||||
#if BUILDFLAG(IS_ANDROID)
|
#if BUILDFLAG(IS_ANDROID)
|
||||||
record =
|
record =
|
||||||
base::FeatureList::IsEnabled(chrome::android::kUmaBackgroundSessions);
|
base::FeatureList::IsEnabled(chrome::android::kUmaBackgroundSessions);
|
||||||
@@ -1505,6 +1514,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
@@ -1506,6 +1515,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||||
std::string process_type =
|
std::string process_type =
|
||||||
command_line.GetSwitchValueASCII(switches::kProcessType);
|
command_line.GetSwitchValueASCII(switches::kProcessType);
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ index c09a805c4ed7b..de89b16690593 100644
|
|||||||
crash_reporter::InitializeCrashKeys();
|
crash_reporter::InitializeCrashKeys();
|
||||||
|
|
||||||
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||||
@@ -1523,6 +1533,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
@@ -1524,6 +1534,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||||
InitMacCrashReporter(command_line, process_type);
|
InitMacCrashReporter(command_line, process_type);
|
||||||
SetUpInstallerPreferences(command_line);
|
SetUpInstallerPreferences(command_line);
|
||||||
#endif
|
#endif
|
||||||
@@ -66,7 +66,7 @@ index c09a805c4ed7b..de89b16690593 100644
|
|||||||
|
|
||||||
#if BUILDFLAG(IS_WIN)
|
#if BUILDFLAG(IS_WIN)
|
||||||
child_process_logging::Init();
|
child_process_logging::Init();
|
||||||
@@ -1733,6 +1744,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
@@ -1734,6 +1745,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||||
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
|
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,7 +74,7 @@ index c09a805c4ed7b..de89b16690593 100644
|
|||||||
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
|
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
|
||||||
// Zygote needs to call InitCrashReporter() in RunZygote().
|
// Zygote needs to call InitCrashReporter() in RunZygote().
|
||||||
if (process_type != switches::kZygoteProcess) {
|
if (process_type != switches::kZygoteProcess) {
|
||||||
@@ -1768,6 +1780,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
@@ -1769,6 +1781,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
|
||||||
// After all the platform Breakpads have been initialized, store the command
|
// After all the platform Breakpads have been initialized, store the command
|
||||||
// line for crash reporting.
|
// line for crash reporting.
|
||||||
crash_keys::SetCrashKeysFromCommandLine(command_line);
|
crash_keys::SetCrashKeysFromCommandLine(command_line);
|
||||||
@@ -82,7 +82,7 @@ index c09a805c4ed7b..de89b16690593 100644
|
|||||||
|
|
||||||
#if BUILDFLAG(ENABLE_PDF)
|
#if BUILDFLAG(ENABLE_PDF)
|
||||||
MaybePatchGdiGetFontData();
|
MaybePatchGdiGetFontData();
|
||||||
@@ -1893,6 +1906,7 @@ void ChromeMainDelegate::ZygoteForked() {
|
@@ -1894,6 +1907,7 @@ void ChromeMainDelegate::ZygoteForked() {
|
||||||
SetUpProfilingShutdownHandler();
|
SetUpProfilingShutdownHandler();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,7 +90,7 @@ index c09a805c4ed7b..de89b16690593 100644
|
|||||||
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
|
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
|
||||||
// this up for the browser process in a different manner.
|
// this up for the browser process in a different manner.
|
||||||
const base::CommandLine* command_line =
|
const base::CommandLine* command_line =
|
||||||
@@ -1905,6 +1919,7 @@ void ChromeMainDelegate::ZygoteForked() {
|
@@ -1906,6 +1920,7 @@ void ChromeMainDelegate::ZygoteForked() {
|
||||||
|
|
||||||
// Reset the command line for the newly spawned process.
|
// Reset the command line for the newly spawned process.
|
||||||
crash_keys::SetCrashKeysFromCommandLine(*command_line);
|
crash_keys::SetCrashKeysFromCommandLine(*command_line);
|
||||||
@@ -98,7 +98,7 @@ index c09a805c4ed7b..de89b16690593 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||||
@@ -2001,6 +2016,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
|
@@ -2002,6 +2017,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
|
||||||
const bool is_browser_process = process_type.empty();
|
const bool is_browser_process = process_type.empty();
|
||||||
const bool gwp_asan_boost_sampling = is_browser_process || IsCanaryDev();
|
const bool gwp_asan_boost_sampling = is_browser_process || IsCanaryDev();
|
||||||
|
|
||||||
@@ -106,7 +106,7 @@ index c09a805c4ed7b..de89b16690593 100644
|
|||||||
memory_system::Initializer()
|
memory_system::Initializer()
|
||||||
.SetGwpAsanParameters(gwp_asan_boost_sampling, process_type)
|
.SetGwpAsanParameters(gwp_asan_boost_sampling, process_type)
|
||||||
.SetProfilingClientParameters(chrome::GetChannel(),
|
.SetProfilingClientParameters(chrome::GetChannel(),
|
||||||
@@ -2010,5 +2026,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
|
@@ -2011,5 +2027,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
|
||||||
memory_system::DispatcherParameters::
|
memory_system::DispatcherParameters::
|
||||||
AllocationTraceRecorderInclusion::kDynamic,
|
AllocationTraceRecorderInclusion::kDynamic,
|
||||||
process_type)
|
process_type)
|
||||||
@@ -536,7 +536,7 @@ index e21d5dbffda0b..113df89dcd68a 100644
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
|
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
|
||||||
index 14c785c5686a8..ed24f5f045006 100644
|
index 6ace1e4dfe2ff..1ed97635c9502 100644
|
||||||
--- chrome/browser/prefs/browser_prefs.cc
|
--- chrome/browser/prefs/browser_prefs.cc
|
||||||
+++ chrome/browser/prefs/browser_prefs.cc
|
+++ chrome/browser/prefs/browser_prefs.cc
|
||||||
@@ -16,6 +16,7 @@
|
@@ -16,6 +16,7 @@
|
||||||
@@ -547,7 +547,7 @@ index 14c785c5686a8..ed24f5f045006 100644
|
|||||||
#include "chrome/browser/about_flags.h"
|
#include "chrome/browser/about_flags.h"
|
||||||
#include "chrome/browser/accessibility/accessibility_labels_service.h"
|
#include "chrome/browser/accessibility/accessibility_labels_service.h"
|
||||||
#include "chrome/browser/accessibility/invert_bubble_prefs.h"
|
#include "chrome/browser/accessibility/invert_bubble_prefs.h"
|
||||||
@@ -194,6 +195,10 @@
|
@@ -195,6 +196,10 @@
|
||||||
#include "chrome/browser/background/background_mode_manager.h"
|
#include "chrome/browser/background/background_mode_manager.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -558,7 +558,7 @@ index 14c785c5686a8..ed24f5f045006 100644
|
|||||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||||
#include "chrome/browser/accessibility/animation_policy_prefs.h"
|
#include "chrome/browser/accessibility/animation_policy_prefs.h"
|
||||||
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
|
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
|
||||||
@@ -1743,7 +1748,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
@@ -1745,7 +1750,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
||||||
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||||
#endif // BUILDFLAG(IS_WIN)
|
#endif // BUILDFLAG(IS_WIN)
|
||||||
|
|
||||||
@@ -568,7 +568,7 @@ index 14c785c5686a8..ed24f5f045006 100644
|
|||||||
downgrade::RegisterPrefs(registry);
|
downgrade::RegisterPrefs(registry);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1779,6 +1785,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
@@ -1781,6 +1787,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
||||||
|
|
||||||
// This is intentionally last.
|
// This is intentionally last.
|
||||||
RegisterLocalStatePrefsForMigration(registry);
|
RegisterLocalStatePrefsForMigration(registry);
|
||||||
@@ -580,7 +580,7 @@ index 14c785c5686a8..ed24f5f045006 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Register prefs applicable to all profiles.
|
// Register prefs applicable to all profiles.
|
||||||
@@ -2213,6 +2224,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
@@ -2215,6 +2226,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||||
const std::string& locale) {
|
const std::string& locale) {
|
||||||
RegisterProfilePrefs(registry, locale);
|
RegisterProfilePrefs(registry, locale);
|
||||||
|
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
|
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
|
||||||
index 01d45469f3bae..d1bed9648e4a2 100644
|
index 60c670c77de04..1876ff2da6098 100644
|
||||||
--- chrome/browser/ui/browser_command_controller.cc
|
--- chrome/browser/ui/browser_command_controller.cc
|
||||||
+++ chrome/browser/ui/browser_command_controller.cc
|
+++ chrome/browser/ui/browser_command_controller.cc
|
||||||
@@ -401,6 +401,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
|
@@ -403,6 +403,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
|
||||||
// choose to not implement CommandUpdaterDelegate inside this class and
|
// choose to not implement CommandUpdaterDelegate inside this class and
|
||||||
// therefore command_updater_ doesn't have the delegate set).
|
// therefore command_updater_ doesn't have the delegate set).
|
||||||
if (!SupportsCommand(id) || !IsCommandEnabled(id)) {
|
if (!SupportsCommand(id) || !IsCommandEnabled(id)) {
|
||||||
@@ -10,7 +10,7 @@ index 01d45469f3bae..d1bed9648e4a2 100644
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -417,6 +418,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
|
@@ -419,6 +420,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
|
||||||
DCHECK(command_updater_.IsCommandEnabled(id))
|
DCHECK(command_updater_.IsCommandEnabled(id))
|
||||||
<< "Invalid/disabled command " << id;
|
<< "Invalid/disabled command " << id;
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@ index 01d45469f3bae..d1bed9648e4a2 100644
|
|||||||
// The order of commands in this switch statement must match the function
|
// The order of commands in this switch statement must match the function
|
||||||
// declaration order in browser.h!
|
// declaration order in browser.h!
|
||||||
switch (id) {
|
switch (id) {
|
||||||
@@ -1179,11 +1187,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
|
@@ -1197,11 +1205,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
|
||||||
// BrowserCommandController, private:
|
// BrowserCommandController, private:
|
||||||
|
|
||||||
bool BrowserCommandController::IsShowingMainUI() {
|
bool BrowserCommandController::IsShowingMainUI() {
|
||||||
@@ -41,10 +41,10 @@ index 01d45469f3bae..d1bed9648e4a2 100644
|
|||||||
|
|
||||||
bool BrowserCommandController::IsWebAppOrCustomTab() const {
|
bool BrowserCommandController::IsWebAppOrCustomTab() const {
|
||||||
diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
|
diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
|
||||||
index fc51015c70183..52de604f96d9e 100644
|
index f080bd8292259..51b40ac1c9e19 100644
|
||||||
--- chrome/browser/ui/toolbar/app_menu_model.cc
|
--- chrome/browser/ui/toolbar/app_menu_model.cc
|
||||||
+++ chrome/browser/ui/toolbar/app_menu_model.cc
|
+++ chrome/browser/ui/toolbar/app_menu_model.cc
|
||||||
@@ -728,6 +728,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel(
|
@@ -730,6 +730,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,7 +102,7 @@ index fc51015c70183..52de604f96d9e 100644
|
|||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
@@ -1572,7 +1623,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
|
@@ -1581,7 +1632,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,7 +111,7 @@ index fc51015c70183..52de604f96d9e 100644
|
|||||||
GlobalError* error =
|
GlobalError* error =
|
||||||
GlobalErrorServiceFactory::GetForProfile(browser_->profile())
|
GlobalErrorServiceFactory::GetForProfile(browser_->profile())
|
||||||
->GetGlobalErrorByMenuItemCommandID(command_id);
|
->GetGlobalErrorByMenuItemCommandID(command_id);
|
||||||
@@ -1587,6 +1638,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
|
@@ -1596,6 +1647,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,7 +142,7 @@ index fc51015c70183..52de604f96d9e 100644
|
|||||||
bool AppMenuModel::IsCommandIdAlerted(int command_id) const {
|
bool AppMenuModel::IsCommandIdAlerted(int command_id) const {
|
||||||
if (command_id == IDC_VIEW_PASSWORDS ||
|
if (command_id == IDC_VIEW_PASSWORDS ||
|
||||||
command_id == IDC_SHOW_PASSWORD_MANAGER) {
|
command_id == IDC_SHOW_PASSWORD_MANAGER) {
|
||||||
@@ -1755,11 +1830,15 @@ void AppMenuModel::Build() {
|
@@ -1764,11 +1839,15 @@ void AppMenuModel::Build() {
|
||||||
kDefaultIconSize));
|
kDefaultIconSize));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -163,7 +163,7 @@ index fc51015c70183..52de604f96d9e 100644
|
|||||||
|
|
||||||
AddItemWithStringId(IDC_PRINT, IDS_PRINT);
|
AddItemWithStringId(IDC_PRINT, IDS_PRINT);
|
||||||
|
|
||||||
@@ -1852,9 +1931,13 @@ void AppMenuModel::Build() {
|
@@ -1861,9 +1940,13 @@ void AppMenuModel::Build() {
|
||||||
kMoreToolsMenuItem);
|
kMoreToolsMenuItem);
|
||||||
|
|
||||||
if (!features::IsChromeRefresh2023()) {
|
if (!features::IsChromeRefresh2023()) {
|
||||||
@@ -180,7 +180,7 @@ index fc51015c70183..52de604f96d9e 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!features::IsChromeRefresh2023()) {
|
if (!features::IsChromeRefresh2023()) {
|
||||||
@@ -1943,6 +2026,11 @@ void AppMenuModel::Build() {
|
@@ -1952,6 +2035,11 @@ void AppMenuModel::Build() {
|
||||||
SetCommandIcon(this, IDC_EXIT, kExitMenuIcon);
|
SetCommandIcon(this, IDC_EXIT, kExitMenuIcon);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -193,10 +193,10 @@ index fc51015c70183..52de604f96d9e 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git chrome/browser/ui/toolbar/app_menu_model.h chrome/browser/ui/toolbar/app_menu_model.h
|
diff --git chrome/browser/ui/toolbar/app_menu_model.h chrome/browser/ui/toolbar/app_menu_model.h
|
||||||
index c477fba63fd1a..3b9eaad8e1906 100644
|
index cc5c28f04e079..8d23e5a3a09c9 100644
|
||||||
--- chrome/browser/ui/toolbar/app_menu_model.h
|
--- chrome/browser/ui/toolbar/app_menu_model.h
|
||||||
+++ chrome/browser/ui/toolbar/app_menu_model.h
|
+++ chrome/browser/ui/toolbar/app_menu_model.h
|
||||||
@@ -218,6 +218,7 @@ class AppMenuModel : public ui::SimpleMenuModel,
|
@@ -220,6 +220,7 @@ class AppMenuModel : public ui::SimpleMenuModel,
|
||||||
void ExecuteCommand(int command_id, int event_flags) override;
|
void ExecuteCommand(int command_id, int event_flags) override;
|
||||||
bool IsCommandIdChecked(int command_id) const override;
|
bool IsCommandIdChecked(int command_id) const override;
|
||||||
bool IsCommandIdEnabled(int command_id) const override;
|
bool IsCommandIdEnabled(int command_id) const override;
|
||||||
@@ -204,7 +204,7 @@ index c477fba63fd1a..3b9eaad8e1906 100644
|
|||||||
bool IsCommandIdAlerted(int command_id) const override;
|
bool IsCommandIdAlerted(int command_id) const override;
|
||||||
bool IsElementIdAlerted(ui::ElementIdentifier element_id) const override;
|
bool IsElementIdAlerted(ui::ElementIdentifier element_id) const override;
|
||||||
bool GetAcceleratorForCommandId(int command_id,
|
bool GetAcceleratorForCommandId(int command_id,
|
||||||
@@ -259,6 +260,8 @@ class AppMenuModel : public ui::SimpleMenuModel,
|
@@ -261,6 +262,8 @@ class AppMenuModel : public ui::SimpleMenuModel,
|
||||||
safety_hub::SafetyHubModuleType sh_module,
|
safety_hub::SafetyHubModuleType sh_module,
|
||||||
int event_flags);
|
int event_flags);
|
||||||
|
|
||||||
@@ -989,7 +989,7 @@ index 880d83324cfa6..a6a80cd0b3def 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
|
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||||
index e97342ef97514..e373f6374fa4c 100644
|
index 8c3395ee6d7fd..3bedbe48a7696 100644
|
||||||
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
|
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||||
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
|
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||||
@@ -191,7 +191,7 @@ class TabstripLikeBackground : public views::Background {
|
@@ -191,7 +191,7 @@ class TabstripLikeBackground : public views::Background {
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
|
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index 9203a7ad0ef6c..b7ba771e6eea0 100644
|
index 3a2e1ab68fa5f..b70522fd8de80 100644
|
||||||
--- content/browser/renderer_host/render_frame_host_impl.cc
|
--- content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
+++ content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -10605,6 +10605,7 @@ void RenderFrameHostImpl::CommitNavigation(
|
@@ -10605,6 +10605,7 @@ void RenderFrameHostImpl::CommitNavigation(
|
||||||
|
Reference in New Issue
Block a user