mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: upgrade to chromium 89.0.4336.0 * update patches * chore: use 'libvulkan.so.1' in the linux manifests CL: https://chromium-review.googlesource.com/c/angle/angle/+/2538430 Upstream renamed libvulkan.so to libvulkan.so.1, so sync our manifests. * chore: update expected window-open default policy. CL: https://chromium-review.googlesource.com/c/chromium/src/+/2429247 Upstream CL contiues the work to make `strict-origin-when-cross-origin` the default referrer policy. This commit changes our window-open tests to expect that policy over the previous `no-referrer-when-downgrade`. * chore: re-export chromium patches No code changes; just line numbers. `git am` failed because the upstream changes were just large enough to require patching to fail w/o fuzzing. The broken patch was patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch * update patches * update patches * fixup! chore: update expected window-open default policy. * chore: disallow copying CppHeapCreateParams Experimental commit to resolve FTBS https://ci.appveyor.com/project/electron-bot/electron-ljo26/builds/36405680#L25345 which introduces a new struct CppHeapCreateParams that aggregates a vector of unique_ptrs. Our Windows CI is unhappy that this struct implicitly deletes its copy ctor, so this commit makes it explicit. Xref: https://chromium-review.googlesource.com/c/v8/v8/+/2536642 * update patches * update patches * fixup! chore: bump chromium to ac06d6903a2c981ab90a8162f1ba0 (master) (#26499) * chore: update calls to gfx::RemoveAcceleratorChar. The call signature for gfx::RemoveAccelerator changed in https://chromium-review.googlesource.com/c/chromium/src/+/2546471 . This commit updates use to match that. * update patches * update patches * chore: update patches * Remove most service manifest remnants from Content https://chromium-review.googlesource.com/c/chromium/src/+/2296482 * Reland "Portals: Fix a11y for orphaned portals" https://chromium-review.googlesource.com/c/chromium/src/+/2542812 * Convert CallbackList::Subscription to a standalone class. https://chromium-review.googlesource.com/c/chromium/src/+/2522860 * fix: actually apply the zlib patch * chore: update patches * chore: update patches * clear out cache * Revert "clear out cache" This reverts commit 6e811fae4b7f4eeb736225ce2460857922763b66. * Update to 89.0.4342.2 * Remove force_ignore_site_for_cookies until we figure out what to do instead 2499162: Remove |force_ignore_site_for_cookies| from IPCs (e.g. ResourceRequest). | https://chromium-review.googlesource.com/c/chromium/src/+/2499162 (cherry picked from commit 102a2a3b8d57b6cddb85e9d24e44de77730c81c3) * Set site_for_cookies to request url so that URLLoader::ShouldForceIgnoreSiteForCookies returns true (cherry picked from commit 7a2510a9f68339a252a25df3839e9e215a476d4b) * 2485887: [Extensions][web_accessible_resources] Use |matches|. https://chromium-review.googlesource.com/c/chromium/src/+/2485887 (cherry picked from commit b67d89155d87c86aa295cda645fdee591dacd512) * 2490383: a11y inspect reorg: implement accessible tree formatter factory https://chromium-review.googlesource.com/c/chromium/src/+/2490383 (cherry picked from commit 8cd4ee013eec12205832d0f763ab4480cdb10c28) * Disable CertVerifierService for now 2559260: Enable CertVerifierService by default | https://chromium-review.googlesource.com/c/chromium/src/+/2559260 (cherry picked from commit 56a4a87dec21c1332e508adae4638bf00371dc73) * 2555005: [api] Simplify ScriptOrigin https://chromium-review.googlesource.com/c/v8/v8/+/2555005 (cherry picked from commit 338d4304bc9c0abcd24306aa4901558b9db9368b) * Actually apply nan patch (cherry picked from commit bf20236386f83229ec09c434d21aca4712d0d53b) * update patches * update to 89.0.4348.1 see if this resolves Windows crashes * Do not build MTLManagedObjectAdapter It's been removed in newer Mantle versions and uses a deprecated enum (cherry picked from commit 36accef04a9047da4f31f214f133866e48f7942c) * 2569367: Remove dead fullscreen code in RenderWidgetHostView and friends https://chromium-review.googlesource.com/c/chromium/src/+/2569367 (cherry picked from commit cab78df863acfb6ca24830eac8f9df11d7d877fd) * 2563553: Remove Flash from PermissionRequestTypes and PermissionTypes. https://chromium-review.googlesource.com/c/chromium/src/+/2563553 (cherry picked from commit d0ba1ec443e5ea234706ee93b5b413ed6c9095d7) * 2568359: mac: Ignore Wdeprecated-declarations for LSSharedFileList* functions. https://chromium-review.googlesource.com/c/chromium/src/+/2568359 (cherry picked from commit 1ca2fa5a3c7bd39419b50a439eb9eec4582ced28) * Remove deprecated performFileOperation usage (cherry picked from commit d2dca0c24950cbc81cec80beac9ba640e200d6fa) * 2546146: Remove browser-hosted InterfaceProvider https://chromium-review.googlesource.com/c/chromium/src/+/2546146 (cherry picked from commit 944da70791253e9a564317f93814ab544c944a8e) * fixup: Add disconnect logic to ElectronBrowserHandlerImpl (cherry picked from commit e4582a10bbdd20d08d94389953cad8a4ea2b7a1d) * 2561401: Add OutputPresenterX11 which uses X11 present extension. https://chromium-review.googlesource.com/c/chromium/src/+/2561401 (cherry picked from commit ef1d0164bdd8b730c51d46c3099d7d4efea0133b) * Allow local networking override for ATS https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html (cherry picked from commit f4a0b5834b78d189acb03d3b43b2160dcc749a7e) * 2565511: [objects] Remove MakeExternal case for uncached internal strings https://chromium-review.googlesource.com/c/v8/v8/+/2565511 (cherry picked from commitcf09a792f0) * Update patches after rebase * Refactor: clean up rfh getters in ElectronBrowserHandlerImpl (cherry picked from commitbe270753e1) * Remove unneeded BindTo (cherry picked from commitca3287895a) * Don't assign ElectronBrowserHandlerImpl at all (cherry picked from commit899ef067ed) * update patches Co-authored-by: Electron Bot <electron@github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
529 lines
18 KiB
Plaintext
529 lines
18 KiB
Plaintext
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/browser.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/mac/bundle_locations.h"
|
|
#include "base/mac/foundation_util.h"
|
|
#include "base/mac/mac_util.h"
|
|
#include "base/mac/scoped_cftyperef.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "net/base/mac/url_conversions.h"
|
|
#include "shell/browser/mac/dict_util.h"
|
|
#include "shell/browser/mac/electron_application.h"
|
|
#include "shell/browser/mac/electron_application_delegate.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/browser/window_list.h"
|
|
#include "shell/common/api/electron_api_native_image.h"
|
|
#include "shell/common/application_info.h"
|
|
#include "shell/common/gin_converters/image_converter.h"
|
|
#include "shell/common/gin_helper/arguments.h"
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/error_thrower.h"
|
|
#include "shell/common/gin_helper/promise.h"
|
|
#include "shell/common/platform_util.h"
|
|
#include "ui/gfx/image/image.h"
|
|
#include "url/gurl.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
NSString* GetAppPathForProtocol(const GURL& url) {
|
|
NSURL* ns_url = [NSURL
|
|
URLWithString:base::SysUTF8ToNSString(url.possibly_invalid_spec())];
|
|
base::ScopedCFTypeRef<CFErrorRef> out_err;
|
|
|
|
base::ScopedCFTypeRef<CFURLRef> openingApp(LSCopyDefaultApplicationURLForURL(
|
|
(CFURLRef)ns_url, kLSRolesAll, out_err.InitializeInto()));
|
|
|
|
if (out_err) {
|
|
// likely kLSApplicationNotFoundErr
|
|
return nullptr;
|
|
}
|
|
NSString* app_path = [base::mac::CFToNSCast(openingApp.get()) path];
|
|
return app_path;
|
|
}
|
|
|
|
gfx::Image GetApplicationIconForProtocol(NSString* _Nonnull app_path) {
|
|
NSImage* image = [[NSWorkspace sharedWorkspace] iconForFile:app_path];
|
|
gfx::Image icon(image);
|
|
return icon;
|
|
}
|
|
|
|
base::string16 GetAppDisplayNameForProtocol(NSString* app_path) {
|
|
NSString* app_display_name =
|
|
[[NSFileManager defaultManager] displayNameAtPath:app_path];
|
|
return base::SysNSStringToUTF16(app_display_name);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
v8::Local<v8::Promise> Browser::GetApplicationInfoForProtocol(
|
|
v8::Isolate* isolate,
|
|
const GURL& url) {
|
|
gin_helper::Promise<gin_helper::Dictionary> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
|
|
NSString* ns_app_path = GetAppPathForProtocol(url);
|
|
|
|
if (!ns_app_path) {
|
|
promise.RejectWithErrorMessage(
|
|
"Unable to retrieve installation path to app");
|
|
return handle;
|
|
}
|
|
|
|
base::string16 app_path = base::SysNSStringToUTF16(ns_app_path);
|
|
base::string16 app_display_name = GetAppDisplayNameForProtocol(ns_app_path);
|
|
gfx::Image app_icon = GetApplicationIconForProtocol(ns_app_path);
|
|
|
|
dict.Set("name", app_display_name);
|
|
dict.Set("path", app_path);
|
|
dict.Set("icon", app_icon);
|
|
|
|
promise.Resolve(dict);
|
|
return handle;
|
|
}
|
|
|
|
void Browser::SetShutdownHandler(base::Callback<bool()> handler) {
|
|
[[AtomApplication sharedApplication] setShutdownHandler:std::move(handler)];
|
|
}
|
|
|
|
void Browser::Focus(gin::Arguments* args) {
|
|
gin_helper::Dictionary opts;
|
|
bool steal_focus = false;
|
|
|
|
if (args->GetNext(&opts)) {
|
|
gin_helper::ErrorThrower thrower(args->isolate());
|
|
if (!opts.Get("steal", &steal_focus)) {
|
|
thrower.ThrowError(
|
|
"Expected options object to contain a 'steal' boolean property");
|
|
return;
|
|
}
|
|
}
|
|
|
|
[[AtomApplication sharedApplication] activateIgnoringOtherApps:steal_focus];
|
|
}
|
|
|
|
void Browser::Hide() {
|
|
[[AtomApplication sharedApplication] hide:nil];
|
|
}
|
|
|
|
void Browser::Show() {
|
|
[[AtomApplication sharedApplication] unhide:nil];
|
|
}
|
|
|
|
void Browser::AddRecentDocument(const base::FilePath& path) {
|
|
NSString* path_string = base::mac::FilePathToNSString(path);
|
|
if (!path_string)
|
|
return;
|
|
NSURL* u = [NSURL fileURLWithPath:path_string];
|
|
if (!u)
|
|
return;
|
|
[[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:u];
|
|
}
|
|
|
|
void Browser::ClearRecentDocuments() {
|
|
[[NSDocumentController sharedDocumentController] clearRecentDocuments:nil];
|
|
}
|
|
|
|
bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
|
|
gin::Arguments* args) {
|
|
NSString* identifier = [base::mac::MainBundle() bundleIdentifier];
|
|
if (!identifier)
|
|
return false;
|
|
|
|
if (!Browser::IsDefaultProtocolClient(protocol, args))
|
|
return false;
|
|
|
|
NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
|
|
CFStringRef protocol_cf = base::mac::NSToCFCast(protocol_ns);
|
|
CFArrayRef bundleList = LSCopyAllHandlersForURLScheme(protocol_cf);
|
|
if (!bundleList) {
|
|
return false;
|
|
}
|
|
// On macOS, we can't query the default, but the handlers list seems to put
|
|
// Apple's defaults first, so we'll use the first option that isn't our bundle
|
|
CFStringRef other = nil;
|
|
for (CFIndex i = 0; i < CFArrayGetCount(bundleList); ++i) {
|
|
other =
|
|
base::mac::CFCast<CFStringRef>(CFArrayGetValueAtIndex(bundleList, i));
|
|
if (![identifier isEqualToString:(__bridge NSString*)other]) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
// No other app was found set it to none instead of setting it back to itself.
|
|
if ([identifier isEqualToString:(__bridge NSString*)other]) {
|
|
other = base::mac::NSToCFCast(@"None");
|
|
}
|
|
|
|
OSStatus return_code = LSSetDefaultHandlerForURLScheme(protocol_cf, other);
|
|
return return_code == noErr;
|
|
}
|
|
|
|
bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
|
|
gin::Arguments* args) {
|
|
if (protocol.empty())
|
|
return false;
|
|
|
|
NSString* identifier = [base::mac::MainBundle() bundleIdentifier];
|
|
if (!identifier)
|
|
return false;
|
|
|
|
NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
|
|
OSStatus return_code = LSSetDefaultHandlerForURLScheme(
|
|
base::mac::NSToCFCast(protocol_ns), base::mac::NSToCFCast(identifier));
|
|
return return_code == noErr;
|
|
}
|
|
|
|
bool Browser::IsDefaultProtocolClient(const std::string& protocol,
|
|
gin::Arguments* args) {
|
|
if (protocol.empty())
|
|
return false;
|
|
|
|
NSString* identifier = [base::mac::MainBundle() bundleIdentifier];
|
|
if (!identifier)
|
|
return false;
|
|
|
|
NSString* protocol_ns = [NSString stringWithUTF8String:protocol.c_str()];
|
|
|
|
base::ScopedCFTypeRef<CFStringRef> bundleId(
|
|
LSCopyDefaultHandlerForURLScheme(base::mac::NSToCFCast(protocol_ns)));
|
|
|
|
if (!bundleId)
|
|
return false;
|
|
|
|
// Ensure the comparison is case-insensitive
|
|
// as LS does not persist the case of the bundle id.
|
|
NSComparisonResult result =
|
|
[base::mac::CFToNSCast(bundleId) caseInsensitiveCompare:identifier];
|
|
return result == NSOrderedSame;
|
|
}
|
|
|
|
base::string16 Browser::GetApplicationNameForProtocol(const GURL& url) {
|
|
NSString* app_path = GetAppPathForProtocol(url);
|
|
if (!app_path) {
|
|
return base::string16();
|
|
}
|
|
base::string16 app_display_name = GetAppDisplayNameForProtocol(app_path);
|
|
return app_display_name;
|
|
}
|
|
|
|
void Browser::SetAppUserModelID(const base::string16& name) {}
|
|
|
|
bool Browser::SetBadgeCount(int count) {
|
|
DockSetBadgeText(count != 0 ? base::NumberToString(count) : "");
|
|
badge_count_ = count;
|
|
return true;
|
|
}
|
|
|
|
void Browser::SetUserActivity(const std::string& type,
|
|
base::DictionaryValue user_info,
|
|
gin::Arguments* args) {
|
|
std::string url_string;
|
|
args->GetNext(&url_string);
|
|
|
|
[[AtomApplication sharedApplication]
|
|
setCurrentActivity:base::SysUTF8ToNSString(type)
|
|
withUserInfo:DictionaryValueToNSDictionary(user_info)
|
|
withWebpageURL:net::NSURLWithGURL(GURL(url_string))];
|
|
}
|
|
|
|
std::string Browser::GetCurrentActivityType() {
|
|
NSUserActivity* userActivity =
|
|
[[AtomApplication sharedApplication] getCurrentActivity];
|
|
return base::SysNSStringToUTF8(userActivity.activityType);
|
|
}
|
|
|
|
void Browser::InvalidateCurrentActivity() {
|
|
[[AtomApplication sharedApplication] invalidateCurrentActivity];
|
|
}
|
|
|
|
void Browser::ResignCurrentActivity() {
|
|
[[AtomApplication sharedApplication] resignCurrentActivity];
|
|
}
|
|
|
|
void Browser::UpdateCurrentActivity(const std::string& type,
|
|
base::DictionaryValue user_info) {
|
|
[[AtomApplication sharedApplication]
|
|
updateCurrentActivity:base::SysUTF8ToNSString(type)
|
|
withUserInfo:DictionaryValueToNSDictionary(user_info)];
|
|
}
|
|
|
|
bool Browser::WillContinueUserActivity(const std::string& type) {
|
|
bool prevent_default = false;
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnWillContinueUserActivity(&prevent_default, type);
|
|
return prevent_default;
|
|
}
|
|
|
|
void Browser::DidFailToContinueUserActivity(const std::string& type,
|
|
const std::string& error) {
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnDidFailToContinueUserActivity(type, error);
|
|
}
|
|
|
|
bool Browser::ContinueUserActivity(const std::string& type,
|
|
base::DictionaryValue user_info) {
|
|
bool prevent_default = false;
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnContinueUserActivity(&prevent_default, type, user_info);
|
|
return prevent_default;
|
|
}
|
|
|
|
void Browser::UserActivityWasContinued(const std::string& type,
|
|
base::DictionaryValue user_info) {
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnUserActivityWasContinued(type, user_info);
|
|
}
|
|
|
|
bool Browser::UpdateUserActivityState(const std::string& type,
|
|
base::DictionaryValue user_info) {
|
|
bool prevent_default = false;
|
|
for (BrowserObserver& observer : observers_)
|
|
observer.OnUpdateUserActivityState(&prevent_default, type, user_info);
|
|
return prevent_default;
|
|
}
|
|
|
|
Browser::LoginItemSettings Browser::GetLoginItemSettings(
|
|
const LoginItemSettings& options) {
|
|
LoginItemSettings settings;
|
|
#if defined(MAS_BUILD)
|
|
settings.open_at_login = platform_util::GetLoginItemEnabled();
|
|
#else
|
|
settings.open_at_login =
|
|
base::mac::CheckLoginItemStatus(&settings.open_as_hidden);
|
|
settings.restore_state = base::mac::WasLaunchedAsLoginItemRestoreState();
|
|
settings.opened_at_login = base::mac::WasLaunchedAsLoginOrResumeItem();
|
|
settings.opened_as_hidden = base::mac::WasLaunchedAsHiddenLoginItem();
|
|
#endif
|
|
return settings;
|
|
}
|
|
|
|
void RemoveFromLoginItems() {
|
|
#pragma clang diagnostic push // https://crbug.com/1154377
|
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
|
// logic to find the login item copied from GetLoginItemForApp in
|
|
// base/mac/mac_util.mm
|
|
base::ScopedCFTypeRef<LSSharedFileListRef> login_items(
|
|
LSSharedFileListCreate(NULL, kLSSharedFileListSessionLoginItems, NULL));
|
|
if (!login_items.get()) {
|
|
LOG(ERROR) << "Couldn't get a Login Items list.";
|
|
return;
|
|
}
|
|
base::scoped_nsobject<NSArray> login_items_array(
|
|
base::mac::CFToNSCast(LSSharedFileListCopySnapshot(login_items, NULL)));
|
|
NSURL* url = [NSURL fileURLWithPath:[base::mac::MainBundle() bundlePath]];
|
|
for (NSUInteger i = 0; i < [login_items_array count]; ++i) {
|
|
LSSharedFileListItemRef item =
|
|
reinterpret_cast<LSSharedFileListItemRef>(login_items_array[i]);
|
|
base::ScopedCFTypeRef<CFErrorRef> error;
|
|
CFURLRef item_url_ref =
|
|
LSSharedFileListItemCopyResolvedURL(item, 0, error.InitializeInto());
|
|
if (!error && item_url_ref) {
|
|
base::ScopedCFTypeRef<CFURLRef> item_url(item_url_ref);
|
|
if (CFEqual(item_url, url)) {
|
|
LSSharedFileListItemRemove(login_items, item);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
#pragma clang diagnostic pop
|
|
}
|
|
|
|
void Browser::SetLoginItemSettings(LoginItemSettings settings) {
|
|
#if defined(MAS_BUILD)
|
|
if (!platform_util::SetLoginItemEnabled(settings.open_at_login)) {
|
|
LOG(ERROR) << "Unable to set login item enabled on sandboxed app.";
|
|
}
|
|
#else
|
|
if (settings.open_at_login) {
|
|
base::mac::AddToLoginItems(settings.open_as_hidden);
|
|
} else {
|
|
RemoveFromLoginItems();
|
|
}
|
|
#endif
|
|
}
|
|
|
|
std::string Browser::GetExecutableFileVersion() const {
|
|
return GetApplicationVersion();
|
|
}
|
|
|
|
std::string Browser::GetExecutableFileProductName() const {
|
|
return GetApplicationName();
|
|
}
|
|
|
|
int Browser::DockBounce(BounceType type) {
|
|
return [[AtomApplication sharedApplication]
|
|
requestUserAttention:static_cast<NSRequestUserAttentionType>(type)];
|
|
}
|
|
|
|
void Browser::DockCancelBounce(int request_id) {
|
|
[[AtomApplication sharedApplication] cancelUserAttentionRequest:request_id];
|
|
}
|
|
|
|
void Browser::DockSetBadgeText(const std::string& label) {
|
|
NSDockTile* tile = [[AtomApplication sharedApplication] dockTile];
|
|
[tile setBadgeLabel:base::SysUTF8ToNSString(label)];
|
|
}
|
|
|
|
void Browser::DockDownloadFinished(const std::string& filePath) {
|
|
[[NSDistributedNotificationCenter defaultCenter]
|
|
postNotificationName:@"com.apple.DownloadFileFinished"
|
|
object:base::SysUTF8ToNSString(filePath)];
|
|
}
|
|
|
|
std::string Browser::DockGetBadgeText() {
|
|
NSDockTile* tile = [[AtomApplication sharedApplication] dockTile];
|
|
return base::SysNSStringToUTF8([tile badgeLabel]);
|
|
}
|
|
|
|
void Browser::DockHide() {
|
|
// Transforming application state from UIElement to Foreground is an
|
|
// asyncronous operation, and unfortunately there is currently no way to know
|
|
// when it is finished.
|
|
// So if we call DockHide => DockShow => DockHide => DockShow in a very short
|
|
// time, we would triger a bug of macOS that, there would be multiple dock
|
|
// icons of the app left in system.
|
|
// To work around this, we make sure DockHide does nothing if it is called
|
|
// immediately after DockShow. After some experiments, 1 second seems to be
|
|
// a proper interval.
|
|
if (!last_dock_show_.is_null() &&
|
|
base::Time::Now() - last_dock_show_ < base::TimeDelta::FromSeconds(1)) {
|
|
return;
|
|
}
|
|
|
|
for (auto* const& window : WindowList::GetWindows())
|
|
[window->GetNativeWindow().GetNativeNSWindow() setCanHide:NO];
|
|
|
|
ProcessSerialNumber psn = {0, kCurrentProcess};
|
|
TransformProcessType(&psn, kProcessTransformToUIElementApplication);
|
|
}
|
|
|
|
bool Browser::DockIsVisible() {
|
|
// Because DockShow has a slight delay this may not be true immediately
|
|
// after that call.
|
|
return ([[NSRunningApplication currentApplication] activationPolicy] ==
|
|
NSApplicationActivationPolicyRegular);
|
|
}
|
|
|
|
v8::Local<v8::Promise> Browser::DockShow(v8::Isolate* isolate) {
|
|
last_dock_show_ = base::Time::Now();
|
|
gin_helper::Promise<void> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
BOOL active = [[NSRunningApplication currentApplication] isActive];
|
|
ProcessSerialNumber psn = {0, kCurrentProcess};
|
|
if (active) {
|
|
// Workaround buggy behavior of TransformProcessType.
|
|
// http://stackoverflow.com/questions/7596643/
|
|
NSArray* runningApps = [NSRunningApplication
|
|
runningApplicationsWithBundleIdentifier:@"com.apple.dock"];
|
|
for (NSRunningApplication* app in runningApps) {
|
|
[app activateWithOptions:NSApplicationActivateIgnoringOtherApps];
|
|
break;
|
|
}
|
|
__block gin_helper::Promise<void> p = std::move(promise);
|
|
dispatch_time_t one_ms = dispatch_time(DISPATCH_TIME_NOW, USEC_PER_SEC);
|
|
dispatch_after(one_ms, dispatch_get_main_queue(), ^{
|
|
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
|
|
dispatch_time_t one_ms = dispatch_time(DISPATCH_TIME_NOW, USEC_PER_SEC);
|
|
dispatch_after(one_ms, dispatch_get_main_queue(), ^{
|
|
[[NSRunningApplication currentApplication]
|
|
activateWithOptions:NSApplicationActivateIgnoringOtherApps];
|
|
p.Resolve();
|
|
});
|
|
});
|
|
} else {
|
|
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
|
|
promise.Resolve();
|
|
}
|
|
return handle;
|
|
}
|
|
|
|
void Browser::DockSetMenu(ElectronMenuModel* model) {
|
|
ElectronApplicationDelegate* delegate =
|
|
(ElectronApplicationDelegate*)[NSApp delegate];
|
|
[delegate setApplicationDockMenu:model];
|
|
}
|
|
|
|
void Browser::DockSetIcon(v8::Isolate* isolate, v8::Local<v8::Value> icon) {
|
|
gfx::Image image;
|
|
|
|
if (!icon->IsNull()) {
|
|
api::NativeImage* native_image = nullptr;
|
|
if (!api::NativeImage::TryConvertNativeImage(isolate, icon, &native_image))
|
|
return;
|
|
image = native_image->image();
|
|
}
|
|
|
|
[[AtomApplication sharedApplication]
|
|
setApplicationIconImage:image.AsNSImage()];
|
|
}
|
|
|
|
void Browser::ShowAboutPanel() {
|
|
NSDictionary* options = DictionaryValueToNSDictionary(about_panel_options_);
|
|
|
|
// Credits must be a NSAttributedString instead of NSString
|
|
NSString* credits = (NSString*)options[@"Credits"];
|
|
if (credits != nil) {
|
|
base::scoped_nsobject<NSMutableDictionary> mutable_options(
|
|
[options mutableCopy]);
|
|
base::scoped_nsobject<NSAttributedString> creditString(
|
|
[[NSAttributedString alloc]
|
|
initWithString:credits
|
|
attributes:@{
|
|
NSForegroundColorAttributeName : [NSColor textColor]
|
|
}]);
|
|
|
|
[mutable_options setValue:creditString forKey:@"Credits"];
|
|
options = [NSDictionary dictionaryWithDictionary:mutable_options];
|
|
}
|
|
|
|
[[AtomApplication sharedApplication]
|
|
orderFrontStandardAboutPanelWithOptions:options];
|
|
}
|
|
|
|
void Browser::SetAboutPanelOptions(base::DictionaryValue options) {
|
|
about_panel_options_.Clear();
|
|
|
|
for (auto& pair : options) {
|
|
std::string& key = pair.first;
|
|
if (!key.empty() && pair.second->is_string()) {
|
|
key[0] = base::ToUpperASCII(key[0]);
|
|
about_panel_options_.Set(key, std::move(pair.second));
|
|
}
|
|
}
|
|
}
|
|
|
|
void Browser::ShowEmojiPanel() {
|
|
[[AtomApplication sharedApplication] orderFrontCharacterPalette:nil];
|
|
}
|
|
|
|
bool Browser::IsEmojiPanelSupported() {
|
|
return true;
|
|
}
|
|
|
|
bool Browser::IsSecureKeyboardEntryEnabled() {
|
|
return password_input_enabler_.get() != nullptr;
|
|
}
|
|
|
|
void Browser::SetSecureKeyboardEntryEnabled(bool enabled) {
|
|
if (enabled) {
|
|
password_input_enabler_ =
|
|
std::make_unique<ui::ScopedPasswordInputEnabler>();
|
|
} else {
|
|
password_input_enabler_.reset();
|
|
}
|
|
}
|
|
|
|
} // namespace electron
|