mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 133.0.6886.0 (#1393452)
This commit is contained in:
@ -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 a1564ffe50f30..bfafcad73a2a2 100644
|
||||
index 419bf206081ba..d0b299714a5eb 100644
|
||||
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
@@ -359,6 +359,18 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
|
||||
@ -32,7 +32,7 @@ index a1564ffe50f30..bfafcad73a2a2 100644
|
||||
id = CollapseCommandsForUMA(id);
|
||||
const auto& map = GetIdcToUmaMap(type);
|
||||
auto it = map.find(id);
|
||||
@@ -908,6 +924,14 @@ RenderViewContextMenu::RenderViewContextMenu(
|
||||
@@ -931,6 +947,14 @@ RenderViewContextMenu::RenderViewContextMenu(
|
||||
: nullptr;
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
|
||||
@ -47,7 +47,7 @@ index a1564ffe50f30..bfafcad73a2a2 100644
|
||||
observers_.AddObserver(&autofill_context_menu_manager_);
|
||||
}
|
||||
|
||||
@@ -1364,6 +1388,12 @@ void RenderViewContextMenu::InitMenu() {
|
||||
@@ -1387,6 +1411,12 @@ void RenderViewContextMenu::InitMenu() {
|
||||
autofill_client->HideAutofillSuggestions(
|
||||
autofill::SuggestionHidingReason::kContextMenuOpened);
|
||||
}
|
||||
@ -60,7 +60,7 @@ index a1564ffe50f30..bfafcad73a2a2 100644
|
||||
}
|
||||
|
||||
Profile* RenderViewContextMenu::GetProfile() const {
|
||||
@@ -3630,6 +3660,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
|
||||
@@ -3656,6 +3686,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
|
||||
execute_plugin_action_callback_ = std::move(cb);
|
||||
}
|
||||
|
||||
@ -88,10 +88,10 @@ index a1564ffe50f30..bfafcad73a2a2 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 b9ab5b1295599..7ad5bcb00ff8b 100644
|
||||
index e31912f931c11..dac994a1958b1 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
|
||||
@@ -155,7 +155,21 @@ class RenderViewContextMenu
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -113,7 +113,7 @@ index b9ab5b1295599..7ad5bcb00ff8b 100644
|
||||
Profile* GetProfile() const;
|
||||
|
||||
// This may return nullptr (e.g. for WebUI dialogs). Virtual to allow tests to
|
||||
@@ -475,6 +489,9 @@ class RenderViewContextMenu
|
||||
@@ -481,6 +495,9 @@ class RenderViewContextMenu
|
||||
// built.
|
||||
bool is_protocol_submenu_valid_ = false;
|
||||
|
||||
@ -189,10 +189,10 @@ index 9f6c5fd44f206..dc50bc909897f 100644
|
||||
runner_->Cancel();
|
||||
}
|
||||
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 a269d358300b8..bf31a3cecdee7 100644
|
||||
index a0a564cbef528..f804cffc6944f 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
|
||||
@@ -150,6 +150,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
|
||||
@@ -149,6 +149,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
|
||||
bool RenderViewContextMenuViews::GetAcceleratorForCommandId(
|
||||
int command_id,
|
||||
ui::Accelerator* accel) const {
|
||||
@ -202,7 +202,7 @@ index a269d358300b8..bf31a3cecdee7 100644
|
||||
// There are no formally defined accelerators we can query so we assume
|
||||
// that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do.
|
||||
switch (command_id) {
|
||||
@@ -386,6 +389,10 @@ void RenderViewContextMenuViews::AppendPlatformEditableItems() {
|
||||
@@ -383,6 +386,10 @@ void RenderViewContextMenuViews::AppendPlatformEditableItems() {
|
||||
}
|
||||
|
||||
void RenderViewContextMenuViews::Show() {
|
||||
@ -213,7 +213,7 @@ index a269d358300b8..bf31a3cecdee7 100644
|
||||
if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
|
||||
return;
|
||||
|
||||
@@ -428,6 +435,11 @@ void RenderViewContextMenuViews::Show() {
|
||||
@@ -425,6 +432,11 @@ void RenderViewContextMenuViews::Show() {
|
||||
}
|
||||
}
|
||||
|
||||
@ -305,10 +305,10 @@ index 042428f77f4ad..e4efd98ca45d5 100644
|
||||
raw_ptr<content::WebContents> web_contents_ = nullptr;
|
||||
};
|
||||
diff --git components/renderer_context_menu/render_view_context_menu_base.cc components/renderer_context_menu/render_view_context_menu_base.cc
|
||||
index edf3c0f19409e..3a194411201fe 100644
|
||||
index 2c4065b89fd0b..b978ebc839209 100644
|
||||
--- components/renderer_context_menu/render_view_context_menu_base.cc
|
||||
+++ components/renderer_context_menu/render_view_context_menu_base.cc
|
||||
@@ -392,6 +392,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const {
|
||||
@@ -396,6 +396,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user