mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 133.0.6943.35 (35-x-y) (#45217)

Browse source 
* chore: bump chromium in DEPS to 133.0.6943.16

* chore: bump chromium in DEPS to 133.0.6943.27

* chore: bump chromium in DEPS to 133.0.6943.35

* chore: bump chromium to 134.0.6968.0

cherry picked from 75eac86506

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
electron-roller[bot] 2025-02-03 15:10:57 -05:00 • committed by GitHub
parent 599030ea08
commit 49078100f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
122 changed files with 682 additions and 622 deletions
Download patch file Download diff file Expand all files Collapse all files

20
shell/browser/api/electron_api_global_shortcut.cc
View file

@ -22,7 +22,7 @@
#endif
using extensions::Command;
using extensions::GlobalShortcutListener;
using ui::GlobalAcceleratorListener;
namespace {
@ -53,8 +53,8 @@ GlobalShortcut::~GlobalShortcut() {
void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
if (!base::Contains(accelerator_callback_map_, accelerator)) {
// This should never occur, because if it does, GlobalShortcutListener
// notifies us with wrong accelerator.
// This should never occur, because if it does,
// ui::GlobalAcceleratorListener notifies us with wrong accelerator.
NOTREACHED();
}
accelerator_callback_map_[accelerator].Run();
@ -99,12 +99,12 @@ bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
if (RegisteringMediaKeyForUntrustedClient(accelerator))
return false;
GlobalShortcutListener::SetShouldUseInternalMediaKeyHandling(false);
ui::GlobalAcceleratorListener::SetShouldUseInternalMediaKeyHandling(false);
}
#endif
if (!GlobalShortcutListener::GetInstance()->RegisterAccelerator(accelerator,
this)) {
if (!ui::GlobalAcceleratorListener::GetInstance()->RegisterAccelerator(
accelerator, this)) {
return false;
}
@ -123,12 +123,12 @@ void GlobalShortcut::Unregister(const ui::Accelerator& accelerator) {
#if BUILDFLAG(IS_MAC)
if (accelerator.IsMediaKey() && !MapHasMediaKeys(accelerator_callback_map_)) {
GlobalShortcutListener::SetShouldUseInternalMediaKeyHandling(true);
ui::GlobalAcceleratorListener::SetShouldUseInternalMediaKeyHandling(true);
}
#endif
GlobalShortcutListener::GetInstance()->UnregisterAccelerator(accelerator,
this);
ui::GlobalAcceleratorListener::GetInstance()->UnregisterAccelerator(
accelerator, this);
}
void GlobalShortcut::UnregisterSome(
@ -149,7 +149,7 @@ void GlobalShortcut::UnregisterAll() {
return;
}
accelerator_callback_map_.clear();
GlobalShortcutListener::GetInstance()->UnregisterAccelerators(this);
ui::GlobalAcceleratorListener::GetInstance()->UnregisterAccelerators(this);
}
// static

9
shell/browser/api/electron_api_global_shortcut.h
View file

@ -9,10 +9,10 @@
#include <vector>
#include "base/functional/callback_forward.h"
#include "chrome/browser/extensions/global_shortcut_listener.h"
#include "extensions/common/extension_id.h"
#include "gin/wrappable.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/base/accelerators/global_accelerator_listener/global_accelerator_listener.h"
namespace gin {
template <typename T>
@ -21,9 +21,8 @@ class Handle;
namespace electron::api {
class GlobalShortcut final
: private extensions::GlobalShortcutListener::Observer,
public gin::Wrappable<GlobalShortcut> {
class GlobalShortcut final : private ui::GlobalAcceleratorListener::Observer,
public gin::Wrappable<GlobalShortcut> {
public:
static gin::Handle<GlobalShortcut> Create(v8::Isolate* isolate);
@ -54,7 +53,7 @@ class GlobalShortcut final
void UnregisterSome(const std::vector<ui::Accelerator>& accelerators);
void UnregisterAll();
// GlobalShortcutListener::Observer implementation.
// GlobalAcceleratorListener::Observer implementation.
void OnKeyPressed(const ui::Accelerator& accelerator) override;
void ExecuteCommand(const extensions::ExtensionId& extension_id,
const std::string& command_id) override;

5
shell/browser/api/electron_api_web_frame_main.cc
View file

@ -93,9 +93,8 @@ namespace electron::api {
// FrameTreeNodeId -> WebFrameMain*
// Using FrameTreeNode allows us to track frame across navigations. This
// is most similar to how <iframe> works.
using FrameTreeNodeIdMap = std::unordered_map<content::FrameTreeNodeId,
WebFrameMain*,
content::FrameTreeNodeId::Hasher>;
using FrameTreeNodeIdMap =
std::unordered_map<content::FrameTreeNodeId, WebFrameMain*>;
// Token -> WebFrameMain*
// Maps exact RFH to a WebFrameMain instance.