Update to Chromium version 106.0.5249.61

This commit is contained in:
Marshall Greenblatt
2022-09-29 12:50:03 +00:00
committed by Marshall Greenblatt
parent cbdc66c0ab
commit 1389ac0dcd
9 changed files with 44 additions and 44 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 693145325ca59..0ecb5bcb7d146 100644
index 039a9e48ea396..35d1bf88b1868 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -305,6 +305,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -42,7 +42,7 @@ index 693145325ca59..0ecb5bcb7d146 100644
}
RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1148,6 +1167,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1154,6 +1173,12 @@ void RenderViewContextMenu::InitMenu() {
// menu, meaning that each menu item added/removed in this function will cause
// it to visibly jump on the screen (see b/173569669).
AppendQuickAnswersItems();
@@ -55,7 +55,7 @@ index 693145325ca59..0ecb5bcb7d146 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -2998,6 +3023,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
@@ -3002,6 +3027,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb);
}
@@ -69,7 +69,7 @@ index 693145325ca59..0ecb5bcb7d146 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 ff9baacda8bc9..a57966a287530 100644
index 81be89d1a76c0..347d6f2beb516 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -127,6 +127,12 @@ class RenderViewContextMenu
@@ -85,7 +85,7 @@ index ff9baacda8bc9..a57966a287530 100644
protected:
Profile* GetProfile() const;
@@ -353,6 +359,9 @@ class RenderViewContextMenu
@@ -355,6 +361,9 @@ class RenderViewContextMenu
// built.
bool is_protocol_submenu_valid_ = false;