Update to Chromium version 106.0.5249.0 (#1036826)

This commit is contained in:
Marshall Greenblatt
2022-08-22 21:37:40 -04:00
parent 6d71f5ffd7
commit 7659dd60ba
84 changed files with 694 additions and 473 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 0dbc60e5bbd04..f8df1337b6c01 100644
index 693145325ca59..0ecb5bcb7d146 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() {
@ -27,7 +27,7 @@ index 0dbc60e5bbd04..f8df1337b6c01 100644
id = CollapseCommandsForUMA(id);
const auto& map = GetIdcToUmaMap(type);
auto it = map.find(id);
@@ -737,6 +748,14 @@ RenderViewContextMenu::RenderViewContextMenu(
@@ -738,6 +749,14 @@ RenderViewContextMenu::RenderViewContextMenu(
? GetBrowser()->app_controller()->system_app()
: nullptr;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -42,7 +42,7 @@ index 0dbc60e5bbd04..f8df1337b6c01 100644
}
RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1143,6 +1162,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1148,6 +1167,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 0dbc60e5bbd04..f8df1337b6c01 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -2981,6 +3006,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
@@ -2998,6 +3023,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb);
}
@ -69,10 +69,10 @@ index 0dbc60e5bbd04..f8df1337b6c01 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 51695cd6d98a8..dfaddfb337baa 100644
index ff9baacda8bc9..a57966a287530 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -124,6 +124,12 @@ class RenderViewContextMenu
@@ -127,6 +127,12 @@ class RenderViewContextMenu
base::OnceCallback<void(content::RenderFrameHost*,
blink::mojom::PluginActionType)> cb);
@ -85,7 +85,7 @@ index 51695cd6d98a8..dfaddfb337baa 100644
protected:
Profile* GetProfile() const;
@@ -349,6 +355,9 @@ class RenderViewContextMenu
@@ -353,6 +359,9 @@ class RenderViewContextMenu
// built.
bool is_protocol_submenu_valid_ = false;