Update to Chromium version 130.0.6723.0 (#1356013)

This commit is contained in:
Marshall Greenblatt
2024-09-27 14:15:44 +00:00
parent e44d33d5bf
commit cd052ec7c3
84 changed files with 758 additions and 736 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 aad2abb0c249a..09c7d5313dea0 100644
index 348128d804493..5d893c71e55ea 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -354,6 +354,18 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -360,6 +360,18 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
return callback.get();
}
@ -21,7 +21,7 @@ index aad2abb0c249a..09c7d5313dea0 100644
enum class UmaEnumIdLookupType {
GeneralEnumId,
ContextSpecificEnumId,
@@ -620,6 +632,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
@@ -626,6 +638,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
return 1;
}
@ -32,7 +32,7 @@ index aad2abb0c249a..09c7d5313dea0 100644
id = CollapseCommandsForUMA(id);
const auto& map = GetIdcToUmaMap(type);
auto it = map.find(id);
@@ -896,6 +912,14 @@ RenderViewContextMenu::RenderViewContextMenu(
@@ -902,6 +918,14 @@ RenderViewContextMenu::RenderViewContextMenu(
: nullptr;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -47,7 +47,7 @@ index aad2abb0c249a..09c7d5313dea0 100644
observers_.AddObserver(&autofill_context_menu_manager_);
}
@@ -1357,6 +1381,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1358,6 +1382,12 @@ void RenderViewContextMenu::InitMenu() {
autofill_client->HideAutofillSuggestions(
autofill::SuggestionHidingReason::kContextMenuOpened);
}
@ -60,7 +60,7 @@ index aad2abb0c249a..09c7d5313dea0 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -3639,6 +3669,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
@@ -3648,6 +3678,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb);
}
@ -88,7 +88,7 @@ index aad2abb0c249a..09c7d5313dea0 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 f3abb9c4164f3..c4c14e820e566 100644
index 6b3874524e87b..4e0fd1d7297f1 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 f3abb9c4164f3..c4c14e820e566 100644
Profile* GetProfile() const;
// This may return nullptr (e.g. for WebUI dialogs). Virtual to allow tests to
@@ -476,6 +490,9 @@ class RenderViewContextMenu
@@ -477,6 +491,9 @@ class RenderViewContextMenu
// built.
bool is_protocol_submenu_valid_ = false;