mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 91.0.4472.0 (#870763)
This commit is contained in:
@ -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 86f785a8658f..e7693b4a5efc 100644
|
||||
index 13ad2a7529bb1..0b003c26815e0 100644
|
||||
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
@@ -253,6 +253,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
||||
@@ -254,6 +254,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
||||
return callback.get();
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ index 86f785a8658f..e7693b4a5efc 100644
|
||||
enum class UmaEnumIdLookupType {
|
||||
GeneralEnumId,
|
||||
ContextSpecificEnumId,
|
||||
@@ -461,6 +468,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
|
||||
@@ -463,6 +470,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
|
||||
if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
|
||||
return 1;
|
||||
|
||||
@ -27,7 +27,7 @@ index 86f785a8658f..e7693b4a5efc 100644
|
||||
id = CollapseCommandsForUMA(id);
|
||||
const auto& map = GetIdcToUmaMap(type);
|
||||
auto it = map.find(id);
|
||||
@@ -616,6 +627,14 @@ RenderViewContextMenu::RenderViewContextMenu(
|
||||
@@ -618,6 +629,14 @@ RenderViewContextMenu::RenderViewContextMenu(
|
||||
}
|
||||
set_content_type(
|
||||
ContextMenuContentTypeFactory::Create(source_web_contents_, params));
|
||||
@ -42,7 +42,7 @@ index 86f785a8658f..e7693b4a5efc 100644
|
||||
}
|
||||
|
||||
RenderViewContextMenu::~RenderViewContextMenu() = default;
|
||||
@@ -966,6 +985,12 @@ void RenderViewContextMenu::InitMenu() {
|
||||
@@ -973,6 +992,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 86f785a8658f..e7693b4a5efc 100644
|
||||
}
|
||||
|
||||
Profile* RenderViewContextMenu::GetProfile() const {
|
||||
@@ -2590,6 +2615,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
|
||||
@@ -2594,6 +2619,12 @@ void RenderViewContextMenu::RegisterMenuShownCallbackForTesting(
|
||||
*GetMenuShownCallback() = std::move(cb);
|
||||
}
|
||||
|
||||
@ -69,10 +69,10 @@ index 86f785a8658f..e7693b4a5efc 100644
|
||||
RenderViewContextMenu::GetHandlersForLinkUrl() {
|
||||
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 25f331b10b01..5ea2e8ba1c7a 100644
|
||||
index 5178db60ba644..845461049e54e 100644
|
||||
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
|
||||
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
|
||||
@@ -92,6 +92,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
|
||||
@@ -91,6 +91,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
|
||||
static void RegisterMenuShownCallbackForTesting(
|
||||
base::OnceCallback<void(RenderViewContextMenu*)> cb);
|
||||
|
||||
@ -85,7 +85,7 @@ index 25f331b10b01..5ea2e8ba1c7a 100644
|
||||
protected:
|
||||
Profile* GetProfile() const;
|
||||
|
||||
@@ -266,6 +272,9 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
|
||||
@@ -265,6 +271,9 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
|
||||
ui::SimpleMenuModel protocol_handler_submenu_model_;
|
||||
ProtocolHandlerRegistry* protocol_handler_registry_;
|
||||
|
||||
@ -96,7 +96,7 @@ index 25f331b10b01..5ea2e8ba1c7a 100644
|
||||
// "Use enhanced spell check" items.
|
||||
std::unique_ptr<SpellingMenuObserver> spelling_suggestions_menu_observer_;
|
||||
diff --git chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
|
||||
index f6ff626c408e..b9300419672d 100644
|
||||
index feec153dcc146..0959c1020bad9 100644
|
||||
--- chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
|
||||
+++ chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
|
||||
@@ -136,6 +136,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
|
||||
@ -110,10 +110,10 @@ index f6ff626c408e..b9300419672d 100644
|
||||
// that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do.
|
||||
switch (command_id) {
|
||||
diff --git components/renderer_context_menu/render_view_context_menu_base.cc components/renderer_context_menu/render_view_context_menu_base.cc
|
||||
index d8ef3850f0ad..d18382efec7f 100644
|
||||
index 62100403d27f0..54182e7d97e3c 100644
|
||||
--- components/renderer_context_menu/render_view_context_menu_base.cc
|
||||
+++ components/renderer_context_menu/render_view_context_menu_base.cc
|
||||
@@ -352,6 +352,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const {
|
||||
@@ -375,6 +375,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -132,10 +132,10 @@ index d8ef3850f0ad..d18382efec7f 100644
|
||||
command_executed_ = true;
|
||||
RecordUsedItem(id);
|
||||
diff --git components/renderer_context_menu/render_view_context_menu_base.h components/renderer_context_menu/render_view_context_menu_base.h
|
||||
index 2dca58a6553e..1d139e77da21 100644
|
||||
index 52002b190fded..ce3277e9f9350 100644
|
||||
--- components/renderer_context_menu/render_view_context_menu_base.h
|
||||
+++ components/renderer_context_menu/render_view_context_menu_base.h
|
||||
@@ -82,6 +82,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
|
||||
@@ -81,6 +81,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
|
||||
|
||||
const ui::SimpleMenuModel& menu_model() const { return menu_model_; }
|
||||
const content::ContextMenuParams& params() const { return params_; }
|
||||
@ -145,7 +145,7 @@ index 2dca58a6553e..1d139e77da21 100644
|
||||
|
||||
// Returns true if the specified command id is known and valid for
|
||||
// this menu. If the command is known |enabled| is set to indicate
|
||||
@@ -90,6 +93,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
|
||||
@@ -89,6 +92,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
|
||||
|
||||
// SimpleMenuModel::Delegate implementation.
|
||||
bool IsCommandIdChecked(int command_id) const override;
|
||||
@ -176,7 +176,7 @@ index 2dca58a6553e..1d139e77da21 100644
|
||||
bool IsCustomItemEnabled(int id) const;
|
||||
|
||||
diff --git components/renderer_context_menu/render_view_context_menu_observer.cc components/renderer_context_menu/render_view_context_menu_observer.cc
|
||||
index 2e2d05f91c64..85b256b2be9b 100644
|
||||
index 2e2d05f91c646..85b256b2be9bd 100644
|
||||
--- components/renderer_context_menu/render_view_context_menu_observer.cc
|
||||
+++ components/renderer_context_menu/render_view_context_menu_observer.cc
|
||||
@@ -15,3 +15,8 @@ bool RenderViewContextMenuObserver::IsCommandIdChecked(int command_id) {
|
||||
@ -189,7 +189,7 @@ index 2e2d05f91c64..85b256b2be9b 100644
|
||||
+ return false;
|
||||
+}
|
||||
diff --git components/renderer_context_menu/render_view_context_menu_observer.h components/renderer_context_menu/render_view_context_menu_observer.h
|
||||
index b360a8eb4e82..6f9023a62904 100644
|
||||
index b360a8eb4e820..6f9023a629046 100644
|
||||
--- components/renderer_context_menu/render_view_context_menu_observer.h
|
||||
+++ components/renderer_context_menu/render_view_context_menu_observer.h
|
||||
@@ -11,6 +11,10 @@ namespace content {
|
||||
|
Reference in New Issue
Block a user