Update to Chromium version 128.0.6613.114

This commit is contained in:
Nik Pavlov
2024-09-02 09:10:34 +00:00
committed by Marshall Greenblatt
parent c1d356f5ab
commit 21db5606bf
11 changed files with 58 additions and 57 deletions

View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 98a4191e1e91d..9fbe141d267c9 100644
index 4932213c27cf0..12963b155a5fe 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -352,6 +352,18 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -32,7 +32,7 @@ index 98a4191e1e91d..9fbe141d267c9 100644
id = CollapseCommandsForUMA(id);
const auto& map = GetIdcToUmaMap(type);
auto it = map.find(id);
@@ -883,6 +899,14 @@ RenderViewContextMenu::RenderViewContextMenu(
@@ -893,6 +909,14 @@ RenderViewContextMenu::RenderViewContextMenu(
: nullptr;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -47,7 +47,7 @@ index 98a4191e1e91d..9fbe141d267c9 100644
observers_.AddObserver(&autofill_context_menu_manager_);
}
@@ -1344,6 +1368,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1354,6 +1378,12 @@ void RenderViewContextMenu::InitMenu() {
autofill_client->HideAutofillSuggestions(
autofill::SuggestionHidingReason::kContextMenuOpened);
}
@@ -60,7 +60,7 @@ index 98a4191e1e91d..9fbe141d267c9 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -3626,6 +3656,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
@@ -3636,6 +3666,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb);
}
@@ -88,7 +88,7 @@ index 98a4191e1e91d..9fbe141d267c9 100644
RenderViewContextMenu::GetHandlersForLinkUrl() {
custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers =
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h
index 1fb447e87c1f9..7e530509425f4 100644
index af505a77c2aa6..d647cfe6bc252 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -153,7 +153,21 @@ class RenderViewContextMenu
@@ -113,7 +113,7 @@ index 1fb447e87c1f9..7e530509425f4 100644
Profile* GetProfile() const;
// This may return nullptr (e.g. for WebUI dialogs). Virtual to allow tests to
@@ -475,6 +489,9 @@ class RenderViewContextMenu
@@ -476,6 +490,9 @@ class RenderViewContextMenu
// built.
bool is_protocol_submenu_valid_ = false;