![electron-roller[bot]](/assets/img/avatar_default.png) ccd4531bfb
			
		
	
	
	
	
	ccd4531bfb* chore: bump chromium in DEPS to 117.0.5846.0 * chore: update patches * 4628901: Bump the macOS deployment target to 10.15 https://chromium-review.googlesource.com/c/chromium/src/+/4628901 * 4593350: [Private Network Access] Trigger Permission Prompt https://chromium-review.googlesource.com/c/chromium/src/+/4593350 * 4631011: Remove unlaunched "InstallReplacementAndroidApp" Platform App APIs https://chromium-review.googlesource.com/c/chromium/src/+/4631011 * chore: disable API deprecation warnings in NSKeyedArchiver * chore: update libcxx filenames * chore: bump chromium in DEPS to 117.0.5848.2 * chore: update feat_add_set_theme_source_to_allow_apps_to.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629743 No manual changes; patch succeeded with fuzz * chore: update process_singleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4605398 Trivial manual patch adjustments to account for code shear. * chore: remove electron::BrowserContext::GetMediaDeviceIDSalt() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4608130 upstream tldr: - content::BrowserContext::GetMediaDeviceIDSalt() - content::ContentBrowserClient::ArePersistentMediaDeviceIDsAllowed() + content::ContentBrowserClient::GetMediaDeviceIDSalt() This commit leaves ElectronBrowserContext::GetMediaDeviceIDSalt() in place (now non-virtual, non-override). It is now called by the new function ElectronBrowserClient::GetMediaDeviceIDSalt(). As a followup, we might want to consider using the new upstream media_device_salt::MediaDeviceSaltService and removing our electron::MediaDeviceIDSalt code. CC @MarshallOfSound for 2nd opinion since he has done the most work on MediaDeviceIDSalt and may have more context. * chore: fix iwyu breakage Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629624 electron_browser_main_parts.cc uses ui::ColorProviderManager but didn't include it. Things worked anyway because we got it indirectly from content/public/browser/web_contents.h until 4629624. * chore: remove call to base::mac::IsAtLeastOS10_14 upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in IAP upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in electron_application_delegate upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove broken-before-macOS-10.15 patch in mas_avoid_usage_of_private_macos_apis.patch Upstream has bumped minimum to macOS 10.15 * chore: remove @available(macOS 10.14) check Upstream minimum requirement for macOS is now 10.15 * chore: update patches * chore: bump chromium in DEPS to 117.0.5850.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5852.0 * chore: update patches * Move two params from NetworkContextParams to NetworkContextFilePaths. https://chromium-review.googlesource.com/c/chromium/src/+/4615930 * WebUSB: Add exclusionFilters to USBRequestDeviceOptions https://chromium-review.googlesource.com/c/chromium/src/+/4614682 * Convert /chrome/browser/ui to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4615920 * fixup! Bump the macOS deployment target to 10.15 * fixup! Bump the macOS deployment target to 10.15 * chore: update libcxx files * win: Remove 10Glass from Windows10Glass function and var names https://chromium-review.googlesource.com/c/chromium/src/+/4641314 * chore: revert 392e5f43 from chromium * Add an ExecutionContext to ScriptState https://chromium-review.googlesource.com/c/chromium/src/+/4609446 * fixup! Add an ExecutionContext to ScriptState * chore: fix header * Revert "chore: revert 392e5f43 from chromium" This reverts commit b7f782943e4ce83cae8cd35780d8d3618cf0772c. * fix: return correct min/max sizes in WinFrameView * fixup! Revert chore: revert 392e5f43 from chromium * fixup! Add an ExecutionContext to ScriptState * Revert "fixup! Revert chore: revert 392e5f43 from chromium" This reverts commit 7e2c7281abfc4f309255339fdba073d90a9ae3eb. * Revert "fix: return correct min/max sizes in WinFrameView" This reverts commit 3f418b1ab5155686730e087ae6cabe4a21b4bb61. * Revert "Revert "chore: revert 392e5f43 from chromium"" This reverts commit 56296d8b7c434147e032e3c3b08c0e371b6c27ba. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
		
			
				
	
	
		
			191 lines
		
	
	
	
		
			5.9 KiB
			
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			191 lines
		
	
	
	
		
			5.9 KiB
			
		
	
	
	
		
			C++
		
	
	
	
	
	
| // Copyright (c) 2014 GitHub, Inc.
 | |
| // Use of this source code is governed by the MIT license that can be
 | |
| // found in the LICENSE file.
 | |
| 
 | |
| #include "shell/browser/api/electron_api_global_shortcut.h"
 | |
| 
 | |
| #include <vector>
 | |
| 
 | |
| #include "base/containers/contains.h"
 | |
| #include "base/stl_util.h"
 | |
| #include "base/strings/utf_string_conversions.h"
 | |
| #include "extensions/common/command.h"
 | |
| #include "gin/dictionary.h"
 | |
| #include "gin/object_template_builder.h"
 | |
| #include "shell/browser/api/electron_api_system_preferences.h"
 | |
| #include "shell/browser/browser.h"
 | |
| #include "shell/common/gin_converters/accelerator_converter.h"
 | |
| #include "shell/common/gin_converters/callback_converter.h"
 | |
| #include "shell/common/node_includes.h"
 | |
| 
 | |
| #if BUILDFLAG(IS_MAC)
 | |
| #include "base/mac/mac_util.h"
 | |
| #endif
 | |
| 
 | |
| using extensions::Command;
 | |
| using extensions::GlobalShortcutListener;
 | |
| 
 | |
| namespace {
 | |
| 
 | |
| #if BUILDFLAG(IS_MAC)
 | |
| bool RegisteringMediaKeyForUntrustedClient(const ui::Accelerator& accelerator) {
 | |
|   return Command::IsMediaKey(accelerator) &&
 | |
|          !electron::api::SystemPreferences::IsTrustedAccessibilityClient(false);
 | |
| }
 | |
| 
 | |
| bool MapHasMediaKeys(
 | |
|     const std::map<ui::Accelerator, base::RepeatingClosure>& accelerator_map) {
 | |
|   auto media_key = std::find_if(
 | |
|       accelerator_map.begin(), accelerator_map.end(),
 | |
|       [](const auto& ac) { return Command::IsMediaKey(ac.first); });
 | |
| 
 | |
|   return media_key != accelerator_map.end();
 | |
| }
 | |
| #endif
 | |
| 
 | |
| }  // namespace
 | |
| 
 | |
| namespace electron::api {
 | |
| 
 | |
| gin::WrapperInfo GlobalShortcut::kWrapperInfo = {gin::kEmbedderNativeGin};
 | |
| 
 | |
| GlobalShortcut::GlobalShortcut(v8::Isolate* isolate) {}
 | |
| 
 | |
| GlobalShortcut::~GlobalShortcut() {
 | |
|   UnregisterAll();
 | |
| }
 | |
| 
 | |
| 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.
 | |
|     NOTREACHED();
 | |
|     return;
 | |
|   }
 | |
|   accelerator_callback_map_[accelerator].Run();
 | |
| }
 | |
| 
 | |
| bool GlobalShortcut::RegisterAll(
 | |
|     const std::vector<ui::Accelerator>& accelerators,
 | |
|     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");
 | |
|     return false;
 | |
|   }
 | |
|   std::vector<ui::Accelerator> registered;
 | |
| 
 | |
|   for (auto& accelerator : accelerators) {
 | |
|     if (!Register(accelerator, callback)) {
 | |
|       // Unregister all shortcuts if any failed.
 | |
|       UnregisterSome(registered);
 | |
|       return false;
 | |
|     }
 | |
| 
 | |
|     registered.push_back(accelerator);
 | |
|   }
 | |
|   return true;
 | |
| }
 | |
| 
 | |
| bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
 | |
|                               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");
 | |
|     return false;
 | |
|   }
 | |
| #if BUILDFLAG(IS_MAC)
 | |
|   if (Command::IsMediaKey(accelerator)) {
 | |
|     if (RegisteringMediaKeyForUntrustedClient(accelerator))
 | |
|       return false;
 | |
| 
 | |
|     GlobalShortcutListener::SetShouldUseInternalMediaKeyHandling(false);
 | |
|   }
 | |
| #endif
 | |
| 
 | |
|   if (!GlobalShortcutListener::GetInstance()->RegisterAccelerator(accelerator,
 | |
|                                                                   this)) {
 | |
|     return false;
 | |
|   }
 | |
| 
 | |
|   accelerator_callback_map_[accelerator] = callback;
 | |
|   return true;
 | |
| }
 | |
| 
 | |
| void GlobalShortcut::Unregister(const ui::Accelerator& accelerator) {
 | |
|   if (!electron::Browser::Get()->is_ready()) {
 | |
|     gin_helper::ErrorThrower(JavascriptEnvironment::GetIsolate())
 | |
|         .ThrowError("globalShortcut cannot be used before the app is ready");
 | |
|     return;
 | |
|   }
 | |
|   if (accelerator_callback_map_.erase(accelerator) == 0)
 | |
|     return;
 | |
| 
 | |
| #if BUILDFLAG(IS_MAC)
 | |
|   if (Command::IsMediaKey(accelerator) &&
 | |
|       !MapHasMediaKeys(accelerator_callback_map_)) {
 | |
|     GlobalShortcutListener::SetShouldUseInternalMediaKeyHandling(true);
 | |
|   }
 | |
| #endif
 | |
| 
 | |
|   GlobalShortcutListener::GetInstance()->UnregisterAccelerator(accelerator,
 | |
|                                                                this);
 | |
| }
 | |
| 
 | |
| void GlobalShortcut::UnregisterSome(
 | |
|     const std::vector<ui::Accelerator>& accelerators) {
 | |
|   for (auto& accelerator : accelerators) {
 | |
|     Unregister(accelerator);
 | |
|   }
 | |
| }
 | |
| 
 | |
| bool GlobalShortcut::IsRegistered(const ui::Accelerator& accelerator) {
 | |
|   return base::Contains(accelerator_callback_map_, accelerator);
 | |
| }
 | |
| 
 | |
| void GlobalShortcut::UnregisterAll() {
 | |
|   if (!electron::Browser::Get()->is_ready()) {
 | |
|     gin_helper::ErrorThrower(JavascriptEnvironment::GetIsolate())
 | |
|         .ThrowError("globalShortcut cannot be used before the app is ready");
 | |
|     return;
 | |
|   }
 | |
|   accelerator_callback_map_.clear();
 | |
|   GlobalShortcutListener::GetInstance()->UnregisterAccelerators(this);
 | |
| }
 | |
| 
 | |
| // static
 | |
| gin::Handle<GlobalShortcut> GlobalShortcut::Create(v8::Isolate* isolate) {
 | |
|   return gin::CreateHandle(isolate, new GlobalShortcut(isolate));
 | |
| }
 | |
| 
 | |
| // static
 | |
| gin::ObjectTemplateBuilder GlobalShortcut::GetObjectTemplateBuilder(
 | |
|     v8::Isolate* isolate) {
 | |
|   return gin::Wrappable<GlobalShortcut>::GetObjectTemplateBuilder(isolate)
 | |
|       .SetMethod("registerAll", &GlobalShortcut::RegisterAll)
 | |
|       .SetMethod("register", &GlobalShortcut::Register)
 | |
|       .SetMethod("isRegistered", &GlobalShortcut::IsRegistered)
 | |
|       .SetMethod("unregister", &GlobalShortcut::Unregister)
 | |
|       .SetMethod("unregisterAll", &GlobalShortcut::UnregisterAll);
 | |
| }
 | |
| 
 | |
| const char* GlobalShortcut::GetTypeName() {
 | |
|   return "GlobalShortcut";
 | |
| }
 | |
| 
 | |
| }  // namespace electron::api
 | |
| 
 | |
| namespace {
 | |
| 
 | |
| void Initialize(v8::Local<v8::Object> exports,
 | |
|                 v8::Local<v8::Value> unused,
 | |
|                 v8::Local<v8::Context> context,
 | |
|                 void* priv) {
 | |
|   v8::Isolate* isolate = context->GetIsolate();
 | |
|   gin::Dictionary dict(isolate, exports);
 | |
|   dict.Set("globalShortcut", electron::api::GlobalShortcut::Create(isolate));
 | |
| }
 | |
| 
 | |
| }  // namespace
 | |
| 
 | |
| NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_global_shortcut, Initialize)
 |