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

chore: bump chromium to 92.0.4499.0 (master) (#29046)

Browse source
This commit is contained in:
Electron Bot 2021-05-06 15:01:04 -07:00 • committed by GitHub
parent cbba602eae
commit d5f2eb5a81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 162 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/browser/api/electron_api_browser_window.h
View file

@ -117,7 +117,7 @@ class BrowserWindow : public BaseWindow,
// Closure that would be called when window is unresponsive when closing,
// it should be cancelled when we can prove that the window is responsive.
base::CancelableClosure window_unresponsive_closure_;
base::CancelableRepeatingClosure window_unresponsive_closure_;
#if defined(OS_MAC)
std::vector<mojom::DraggableRegionPtr> draggable_regions_;

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

@ -73,7 +73,7 @@ void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
bool GlobalShortcut::RegisterAll(
const std::vector<ui::Accelerator>& accelerators,
const base::Closure& callback) {
const base::RepeatingClosure& callback) {
if (!electron::Browser::Get()->is_ready()) {
gin_helper::ErrorThrower(JavascriptEnvironment::GetIsolate())
.ThrowError("globalShortcut cannot be used before the app is ready");
@ -94,7 +94,7 @@ bool GlobalShortcut::RegisterAll(
}
bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
const base::Closure& callback) {
const base::RepeatingClosure& callback) {
if (!electron::Browser::Get()->is_ready()) {
gin_helper::ErrorThrower(JavascriptEnvironment::GetIsolate())
.ThrowError("globalShortcut cannot be used before the app is ready");

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

@ -35,12 +35,13 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
~GlobalShortcut() override;
private:
typedef std::map<ui::Accelerator, base::Closure> AcceleratorCallbackMap;
typedef std::map<ui::Accelerator, base::RepeatingClosure>
AcceleratorCallbackMap;
bool RegisterAll(const std::vector<ui::Accelerator>& accelerators,
const base::Closure& callback);
const base::RepeatingClosure& callback);
bool Register(const ui::Accelerator& accelerator,
const base::Closure& callback);
const base::RepeatingClosure& callback);
bool IsRegistered(const ui::Accelerator& accelerator);
void Unregister(const ui::Accelerator& accelerator);
void UnregisterSome(const std::vector<ui::Accelerator>& accelerators);