Update to Chromium version 100.0.4896.0 (#972766)

This commit is contained in:
Marshall Greenblatt
2022-02-21 17:23:40 -05:00
parent a2c621bf8b
commit f97f0bbda6
120 changed files with 668 additions and 725 deletions

View File

@ -1,8 +1,8 @@
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 0c42ba3e13fe9..2bb347fe9cd50 100644
index 1301f3baf5b7f..bebc86d812313 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -293,6 +293,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -292,6 +292,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
return callback.get();
}
@ -16,7 +16,7 @@ index 0c42ba3e13fe9..2bb347fe9cd50 100644
enum class UmaEnumIdLookupType {
GeneralEnumId,
ContextSpecificEnumId,
@@ -506,6 +513,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
@@ -504,6 +511,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
return 1;
@ -27,7 +27,7 @@ index 0c42ba3e13fe9..2bb347fe9cd50 100644
id = CollapseCommandsForUMA(id);
const auto& map = GetIdcToUmaMap(type);
auto it = map.find(id);
@@ -697,6 +708,14 @@ RenderViewContextMenu::RenderViewContextMenu(
@@ -695,6 +706,14 @@ RenderViewContextMenu::RenderViewContextMenu(
system_app_ = GetBrowser() && GetBrowser()->app_controller()
? GetBrowser()->app_controller()->system_app()
: nullptr;
@ -42,7 +42,7 @@ index 0c42ba3e13fe9..2bb347fe9cd50 100644
}
RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1064,6 +1083,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1062,6 +1081,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 0c42ba3e13fe9..2bb347fe9cd50 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -2893,6 +2918,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
@@ -2832,6 +2857,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb);
}
@ -69,7 +69,7 @@ index 0c42ba3e13fe9..2bb347fe9cd50 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 a45df3c894cf5..c97a1ecb08579 100644
index 72d55de086c14..039d28af436d7 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -126,6 +126,12 @@ class RenderViewContextMenu
@ -85,7 +85,7 @@ index a45df3c894cf5..c97a1ecb08579 100644
protected:
Profile* GetProfile() const;
@@ -329,6 +335,9 @@ class RenderViewContextMenu
@@ -334,6 +340,9 @@ class RenderViewContextMenu
// built.
bool is_protocol_submenu_valid_ = false;