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

refactor: ginify app (#24679)

Browse source
This commit is contained in:
Jeremy Rose 2020-07-28 16:43:43 -07:00 • committed by GitHub
parent 834408a50f
commit 9c37e12e2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 91 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/browser/api/app.ts
View file

@ -2,40 +2,35 @@ import * as fs from 'fs';
import * as path from 'path'; import * as path from 'path';
import { deprecate, Menu } from 'electron/main'; import { deprecate, Menu } from 'electron/main';
import { EventEmitter } from 'events';
const bindings = process._linkedBinding('electron_browser_app'); const bindings = process._linkedBinding('electron_browser_app');
const commandLine = process._linkedBinding('electron_common_command_line'); const commandLine = process._linkedBinding('electron_common_command_line');
const { app, App } = bindings; const { app } = bindings;
// Only one app object permitted. // Only one app object permitted.
export default app; export default app;
let dockMenu: Electron.Menu | null = null; let dockMenu: Electron.Menu | null = null;
// App is an EventEmitter.
Object.setPrototypeOf(App.prototype, EventEmitter.prototype);
EventEmitter.call(app as any);
// Properties. // Properties.
const nativeASGetter = app.isAccessibilitySupportEnabled; const nativeASGetter = app.isAccessibilitySupportEnabled;
const nativeASSetter = app.setAccessibilitySupportEnabled; const nativeASSetter = app.setAccessibilitySupportEnabled;
Object.defineProperty(App.prototype, 'accessibilitySupportEnabled', { Object.defineProperty(app, 'accessibilitySupportEnabled', {
get: () => nativeASGetter.call(app), get: () => nativeASGetter.call(app),
set: (enabled) => nativeASSetter.call(app, enabled) set: (enabled) => nativeASSetter.call(app, enabled)
}); });
const nativeBCGetter = app.getBadgeCount; const nativeBCGetter = app.getBadgeCount;
const nativeBCSetter = app.setBadgeCount; const nativeBCSetter = app.setBadgeCount;
Object.defineProperty(App.prototype, 'badgeCount', { Object.defineProperty(app, 'badgeCount', {
get: () => nativeBCGetter.call(app), get: () => nativeBCGetter.call(app),
set: (count) => nativeBCSetter.call(app, count) set: (count) => nativeBCSetter.call(app, count)
}); });
const nativeNGetter = app.getName; const nativeNGetter = app.getName;
const nativeNSetter = app.setName; const nativeNSetter = app.setName;
Object.defineProperty(App.prototype, 'name', { Object.defineProperty(app, 'name', {
get: () => nativeNGetter.call(app), get: () => nativeNGetter.call(app),
set: (name) => nativeNSetter.call(app, name) set: (name) => nativeNSetter.call(app, name)
}); });
@ -60,7 +55,7 @@ Object.defineProperty(app, 'applicationMenu', {
} }
}); });
App.prototype.isPackaged = (() => { (app as any).isPackaged = (() => {
const execFile = path.basename(process.execPath).toLowerCase(); const execFile = path.basename(process.execPath).toLowerCase();
if (process.platform === 'win32') { if (process.platform === 'win32') {
return execFile !== 'electron.exe'; return execFile !== 'electron.exe';
@ -137,4 +132,4 @@ for (const name of events) {
// Deprecate allowRendererProcessReuse but only if they set it to false, no need to log if // Deprecate allowRendererProcessReuse but only if they set it to false, no need to log if
// they are setting it to true // they are setting it to true
deprecate.removeProperty(app, 'allowRendererProcessReuse', [false]); deprecate.removeProperty({ __proto__: app } as any, 'allowRendererProcessReuse', [false]);

70
shell/browser/api/electron_api_app.cc
View file

@ -382,6 +382,8 @@ namespace electron {
namespace api { namespace api {
gin::WrapperInfo App::kWrapperInfo = {gin::kEmbedderNativeGin};
namespace { namespace {
IconLoader::IconSize GetIconSizeByString(const std::string& size) { IconLoader::IconSize GetIconSizeByString(const std::string& size) {
@ -466,7 +468,7 @@ void OnClientCertificateSelected(
v8::Isolate* isolate, v8::Isolate* isolate,
std::shared_ptr<content::ClientCertificateDelegate> delegate, std::shared_ptr<content::ClientCertificateDelegate> delegate,
std::shared_ptr<net::ClientCertIdentityList> identities, std::shared_ptr<net::ClientCertIdentityList> identities,
gin_helper::Arguments* args) { gin::Arguments* args) {
if (args->Length() == 2) { if (args->Length() == 2) {
delegate->ContinueWithCertificate(nullptr, nullptr); delegate->ContinueWithCertificate(nullptr, nullptr);
return; return;
@ -481,7 +483,8 @@ void OnClientCertificateSelected(
gin_helper::Dictionary cert_data; gin_helper::Dictionary cert_data;
if (!gin::ConvertFromV8(isolate, val, &cert_data)) { if (!gin::ConvertFromV8(isolate, val, &cert_data)) {
args->ThrowError("Must pass valid certificate object."); gin_helper::ErrorThrower(isolate).ThrowError(
"Must pass valid certificate object.");
return; return;
} }
@ -548,7 +551,7 @@ void OnIconDataAvailable(gin_helper::Promise<gfx::Image> promise,
} // namespace } // namespace
App::App(v8::Isolate* isolate) { App::App() {
static_cast<ElectronBrowserClient*>(ElectronBrowserClient::Get()) static_cast<ElectronBrowserClient*>(ElectronBrowserClient::Get())
->set_delegate(this); ->set_delegate(this);
Browser::Get()->AddObserver(this); Browser::Get()->AddObserver(this);
@ -558,7 +561,6 @@ App::App(v8::Isolate* isolate) {
content::PROCESS_TYPE_BROWSER, base::GetCurrentProcessHandle(), content::PROCESS_TYPE_BROWSER, base::GetCurrentProcessHandle(),
base::ProcessMetrics::CreateCurrentProcessMetrics()); base::ProcessMetrics::CreateCurrentProcessMetrics());
app_metrics_[pid] = std::move(process_metric); app_metrics_[pid] = std::move(process_metric);
Init(isolate);
} }
App::~App() { App::~App() {
@ -707,8 +709,9 @@ bool App::CanCreateWindow(
bool user_gesture, bool user_gesture,
bool opener_suppressed, bool opener_suppressed,
bool* no_javascript_access) { bool* no_javascript_access) {
v8::Locker locker(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope handle_scope(isolate()); v8::Locker locker(isolate);
v8::HandleScope handle_scope(isolate);
content::WebContents* web_contents = content::WebContents* web_contents =
content::WebContents::FromRenderFrameHost(opener); content::WebContents::FromRenderFrameHost(opener);
if (web_contents) { if (web_contents) {
@ -732,11 +735,12 @@ void App::AllowCertificateError(
bool strict_enforcement, bool strict_enforcement,
base::OnceCallback<void(content::CertificateRequestResultType)> callback) { base::OnceCallback<void(content::CertificateRequestResultType)> callback) {
auto adapted_callback = base::AdaptCallbackForRepeating(std::move(callback)); auto adapted_callback = base::AdaptCallbackForRepeating(std::move(callback));
v8::Locker locker(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope handle_scope(isolate()); v8::Locker locker(isolate);
v8::HandleScope handle_scope(isolate);
bool prevent_default = bool prevent_default =
Emit("certificate-error", Emit("certificate-error",
WebContents::FromOrCreate(isolate(), web_contents), request_url, WebContents::FromOrCreate(isolate, web_contents), request_url,
net::ErrorToString(cert_error), ssl_info.cert, adapted_callback); net::ErrorToString(cert_error), ssl_info.cert, adapted_callback);
// Deny the certificate by default. // Deny the certificate by default.
@ -761,11 +765,12 @@ base::OnceClosure App::SelectClientCertificate(
auto shared_identities = auto shared_identities =
std::make_shared<net::ClientCertIdentityList>(std::move(identities)); std::make_shared<net::ClientCertIdentityList>(std::move(identities));
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
bool prevent_default = bool prevent_default =
Emit("select-client-certificate", Emit("select-client-certificate",
WebContents::FromOrCreate(isolate(), web_contents), WebContents::FromOrCreate(isolate, web_contents),
cert_request_info->host_and_port.ToString(), std::move(client_certs), cert_request_info->host_and_port.ToString(), std::move(client_certs),
base::BindOnce(&OnClientCertificateSelected, isolate(), base::BindOnce(&OnClientCertificateSelected, isolate,
shared_delegate, shared_identities)); shared_delegate, shared_identities));
// Default to first certificate from the platform store. // Default to first certificate from the platform store.
@ -816,8 +821,9 @@ void App::BrowserChildProcessKilled(
void App::BrowserChildProcessCrashedOrKilled( void App::BrowserChildProcessCrashedOrKilled(
const content::ChildProcessData& data, const content::ChildProcessData& data,
const content::ChildProcessTerminationInfo& info) { const content::ChildProcessTerminationInfo& info) {
v8::HandleScope handle_scope(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
auto details = gin_helper::Dictionary::CreateEmpty(isolate()); v8::HandleScope handle_scope(isolate);
auto details = gin_helper::Dictionary::CreateEmpty(isolate);
details.Set("type", content::GetProcessTypeNameInEnglish(data.process_type)); details.Set("type", content::GetProcessTypeNameInEnglish(data.process_type));
details.Set("reason", info.status); details.Set("reason", info.status);
details.Set("exitCode", info.exit_code); details.Set("exitCode", info.exit_code);
@ -1049,7 +1055,7 @@ void App::ReleaseSingleInstanceLock() {
} }
} }
bool App::Relaunch(gin_helper::Arguments* js_args) { bool App::Relaunch(gin::Arguments* js_args) {
// Parse parameters. // Parse parameters.
bool override_argv = false; bool override_argv = false;
base::FilePath exec_path; base::FilePath exec_path;
@ -1135,8 +1141,7 @@ void App::SetAccessibilitySupportEnabled(gin_helper::ErrorThrower thrower,
Browser::Get()->OnAccessibilitySupportChanged(); Browser::Get()->OnAccessibilitySupportChanged();
} }
Browser::LoginItemSettings App::GetLoginItemSettings( Browser::LoginItemSettings App::GetLoginItemSettings(gin::Arguments* args) {
gin_helper::Arguments* args) {
Browser::LoginItemSettings options; Browser::LoginItemSettings options;
args->GetNext(&options); args->GetNext(&options);
return Browser::Get()->GetLoginItemSettings(options); return Browser::Get()->GetLoginItemSettings(options);
@ -1190,19 +1195,21 @@ v8::Local<v8::Value> App::GetJumpListSettings() {
LOG(ERROR) << "Failed to begin Jump List transaction."; LOG(ERROR) << "Failed to begin Jump List transaction.";
} }
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
dict.Set("minItems", min_items); dict.Set("minItems", min_items);
dict.Set("removedItems", gin::ConvertToV8(isolate(), removed_items)); dict.Set("removedItems", gin::ConvertToV8(isolate, removed_items));
return dict.GetHandle(); return dict.GetHandle();
} }
JumpListResult App::SetJumpList(v8::Local<v8::Value> val, JumpListResult App::SetJumpList(v8::Local<v8::Value> val,
gin_helper::Arguments* args) { gin::Arguments* args) {
std::vector<JumpListCategory> categories; std::vector<JumpListCategory> categories;
bool delete_jump_list = val->IsNull(); bool delete_jump_list = val->IsNull();
if (!delete_jump_list && if (!delete_jump_list &&
!gin::ConvertFromV8(args->isolate(), val, &categories)) { !gin::ConvertFromV8(args->isolate(), val, &categories)) {
args->ThrowError("Argument must be null or an array of categories"); gin_helper::ErrorThrower(args->isolate())
.ThrowError("Argument must be null or an array of categories");
return JumpListResult::ARGUMENT_ERROR; return JumpListResult::ARGUMENT_ERROR;
} }
@ -1234,8 +1241,9 @@ JumpListResult App::SetJumpList(v8::Local<v8::Value> val,
#endif // defined(OS_WIN) #endif // defined(OS_WIN)
v8::Local<v8::Promise> App::GetFileIcon(const base::FilePath& path, v8::Local<v8::Promise> App::GetFileIcon(const base::FilePath& path,
gin_helper::Arguments* args) { gin::Arguments* args) {
gin_helper::Promise<gfx::Image> promise(isolate()); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
gin_helper::Promise<gfx::Image> promise(isolate);
v8::Local<v8::Promise> handle = promise.GetHandle(); v8::Local<v8::Promise> handle = promise.GetHandle();
base::FilePath normalized_path = path.NormalizePathSeparators(); base::FilePath normalized_path = path.NormalizePathSeparators();
@ -1427,7 +1435,7 @@ bool App::IsInApplicationsFolder() {
return ElectronBundleMover::IsCurrentAppInApplicationsFolder(); return ElectronBundleMover::IsCurrentAppInApplicationsFolder();
} }
int DockBounce(gin_helper::Arguments* args) { int DockBounce(gin::Arguments* args) {
int request_id = -1; int request_id = -1;
std::string type = "informational"; std::string type = "informational";
args->GetNext(&type); args->GetNext(&type);
@ -1478,7 +1486,7 @@ v8::Local<v8::Value> App::GetDockAPI(v8::Isolate* isolate) {
// static // static
App* App::Get() { App* App::Get() {
static base::NoDestructor<App> app(v8::Isolate::GetCurrent()); static base::NoDestructor<App> app;
return app.get(); return app.get();
} }
@ -1487,12 +1495,9 @@ gin::Handle<App> App::Create(v8::Isolate* isolate) {
return gin::CreateHandle(isolate, Get()); return gin::CreateHandle(isolate, Get());
} }
// static gin::ObjectTemplateBuilder App::GetObjectTemplateBuilder(v8::Isolate* isolate) {
void App::BuildPrototype(v8::Isolate* isolate,
v8::Local<v8::FunctionTemplate> prototype) {
prototype->SetClassName(gin::StringToV8(isolate, "App"));
auto browser = base::Unretained(Browser::Get()); auto browser = base::Unretained(Browser::Get());
gin_helper::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate()) return gin_helper::EventEmitterMixin<App>::GetObjectTemplateBuilder(isolate)
.SetMethod("quit", base::BindRepeating(&Browser::Quit, browser)) .SetMethod("quit", base::BindRepeating(&Browser::Quit, browser))
.SetMethod("exit", base::BindRepeating(&Browser::Exit, browser)) .SetMethod("exit", base::BindRepeating(&Browser::Exit, browser))
.SetMethod("focus", base::BindRepeating(&Browser::Focus, browser)) .SetMethod("focus", base::BindRepeating(&Browser::Focus, browser))
@ -1622,6 +1627,10 @@ void App::BuildPrototype(v8::Isolate* isolate,
&App::SetBrowserClientCanUseCustomSiteInstance); &App::SetBrowserClientCanUseCustomSiteInstance);
} }
const char* App::GetTypeName() {
return "App";
}
} // namespace api } // namespace api
} // namespace electron } // namespace electron
@ -1634,9 +1643,6 @@ void Initialize(v8::Local<v8::Object> exports,
void* priv) { void* priv) {
v8::Isolate* isolate = context->GetIsolate(); v8::Isolate* isolate = context->GetIsolate();
gin_helper::Dictionary dict(isolate, exports); gin_helper::Dictionary dict(isolate, exports);
dict.Set("App", electron::api::App::GetConstructor(isolate)
->GetFunction(context)
.ToLocalChecked());
dict.Set("app", electron::api::App::Create(isolate)); dict.Set("app", electron::api::App::Create(isolate));
} }

25
shell/browser/api/electron_api_app.h
View file

@ -25,9 +25,9 @@
#include "shell/browser/browser.h" #include "shell/browser/browser.h"
#include "shell/browser/browser_observer.h" #include "shell/browser/browser_observer.h"
#include "shell/browser/electron_browser_client.h" #include "shell/browser/electron_browser_client.h"
#include "shell/browser/event_emitter_mixin.h"
#include "shell/common/gin_helper/dictionary.h" #include "shell/common/gin_helper/dictionary.h"
#include "shell/common/gin_helper/error_thrower.h" #include "shell/common/gin_helper/error_thrower.h"
#include "shell/common/gin_helper/event_emitter.h"
#include "shell/common/gin_helper/promise.h" #include "shell/common/gin_helper/promise.h"
#if defined(USE_NSS_CERTS) #if defined(USE_NSS_CERTS)
@ -47,7 +47,8 @@ enum class JumpListResult : int;
namespace api { namespace api {
class App : public ElectronBrowserClient::Delegate, class App : public ElectronBrowserClient::Delegate,
public gin_helper::EventEmitter<App>, public gin::Wrappable<App>,
public gin_helper::EventEmitterMixin<App>,
public BrowserObserver, public BrowserObserver,
public content::GpuDataManagerObserver, public content::GpuDataManagerObserver,
public content::BrowserChildProcessObserver { public content::BrowserChildProcessObserver {
@ -58,8 +59,11 @@ class App : public ElectronBrowserClient::Delegate,
static gin::Handle<App> Create(v8::Isolate* isolate); static gin::Handle<App> Create(v8::Isolate* isolate);
static App* Get(); static App* Get();
static void BuildPrototype(v8::Isolate* isolate, // gin::Wrappable
v8::Local<v8::FunctionTemplate> prototype); static gin::WrapperInfo kWrapperInfo;
gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
v8::Isolate* isolate) override;
const char* GetTypeName() override;
#if defined(USE_NSS_CERTS) #if defined(USE_NSS_CERTS)
void OnCertificateManagerModelCreated( void OnCertificateManagerModelCreated(
@ -72,7 +76,7 @@ class App : public ElectronBrowserClient::Delegate,
void RenderProcessReady(content::RenderProcessHost* host); void RenderProcessReady(content::RenderProcessHost* host);
void RenderProcessDisconnected(base::ProcessId host_pid); void RenderProcessDisconnected(base::ProcessId host_pid);
explicit App(v8::Isolate* isolate); App();
private: private:
~App() override; ~App() override;
@ -185,20 +189,20 @@ class App : public ElectronBrowserClient::Delegate,
bool HasSingleInstanceLock() const; bool HasSingleInstanceLock() const;
bool RequestSingleInstanceLock(); bool RequestSingleInstanceLock();
void ReleaseSingleInstanceLock(); void ReleaseSingleInstanceLock();
bool Relaunch(gin_helper::Arguments* args); bool Relaunch(gin::Arguments* args);
void DisableHardwareAcceleration(gin_helper::ErrorThrower thrower); void DisableHardwareAcceleration(gin_helper::ErrorThrower thrower);
void DisableDomainBlockingFor3DAPIs(gin_helper::ErrorThrower thrower); void DisableDomainBlockingFor3DAPIs(gin_helper::ErrorThrower thrower);
bool IsAccessibilitySupportEnabled(); bool IsAccessibilitySupportEnabled();
void SetAccessibilitySupportEnabled(gin_helper::ErrorThrower thrower, void SetAccessibilitySupportEnabled(gin_helper::ErrorThrower thrower,
bool enabled); bool enabled);
Browser::LoginItemSettings GetLoginItemSettings(gin_helper::Arguments* args); Browser::LoginItemSettings GetLoginItemSettings(gin::Arguments* args);
#if defined(USE_NSS_CERTS) #if defined(USE_NSS_CERTS)
void ImportCertificate(gin_helper::ErrorThrower thrower, void ImportCertificate(gin_helper::ErrorThrower thrower,
base::Value options, base::Value options,
net::CompletionOnceCallback callback); net::CompletionOnceCallback callback);
#endif #endif
v8::Local<v8::Promise> GetFileIcon(const base::FilePath& path, v8::Local<v8::Promise> GetFileIcon(const base::FilePath& path,
gin_helper::Arguments* args); gin::Arguments* args);
std::vector<gin_helper::Dictionary> GetAppMetrics(v8::Isolate* isolate); std::vector<gin_helper::Dictionary> GetAppMetrics(v8::Isolate* isolate);
v8::Local<v8::Value> GetGPUFeatureStatus(v8::Isolate* isolate); v8::Local<v8::Value> GetGPUFeatureStatus(v8::Isolate* isolate);
@ -221,7 +225,7 @@ class App : public ElectronBrowserClient::Delegate,
#if defined(MAS_BUILD) #if defined(MAS_BUILD)
base::RepeatingCallback<void()> StartAccessingSecurityScopedResource( base::RepeatingCallback<void()> StartAccessingSecurityScopedResource(
gin_helper::Arguments* args); gin::Arguments* args);
#endif #endif
#if defined(OS_WIN) #if defined(OS_WIN)
@ -229,8 +233,7 @@ class App : public ElectronBrowserClient::Delegate,
v8::Local<v8::Value> GetJumpListSettings(); v8::Local<v8::Value> GetJumpListSettings();
// Set or remove a custom Jump List for the application. // Set or remove a custom Jump List for the application.
JumpListResult SetJumpList(v8::Local<v8::Value> val, JumpListResult SetJumpList(v8::Local<v8::Value> val, gin::Arguments* args);
gin_helper::Arguments* args);
#endif // defined(OS_WIN) #endif // defined(OS_WIN)
std::unique_ptr<ProcessSingleton> process_singleton_; std::unique_ptr<ProcessSingleton> process_singleton_;

8
shell/browser/api/electron_api_app_mas.mm
View file

@ -22,7 +22,7 @@ void OnStopAccessingSecurityScopedResource(NSURL* bookmarkUrl) {
// Get base64 encoded NSData, create a bookmark for it and start accessing it. // Get base64 encoded NSData, create a bookmark for it and start accessing it.
base::RepeatingCallback<void()> App::StartAccessingSecurityScopedResource( base::RepeatingCallback<void()> App::StartAccessingSecurityScopedResource(
gin_helper::Arguments* args) { gin::Arguments* args) {
std::string data; std::string data;
args->GetNext(&data); args->GetNext(&data);
NSString* base64str = base::SysUTF8ToNSString(data); NSString* base64str = base::SysUTF8ToNSString(data);
@ -42,11 +42,13 @@ base::RepeatingCallback<void()> App::StartAccessingSecurityScopedResource(
if (error != nil) { if (error != nil) {
NSString* err = NSString* err =
[NSString stringWithFormat:@"NSError: %@ %@", error, [error userInfo]]; [NSString stringWithFormat:@"NSError: %@ %@", error, [error userInfo]];
args->ThrowError(base::SysNSStringToUTF8(err)); gin_helper::ErrorThrower(args->isolate())
.ThrowError(base::SysNSStringToUTF8(err));
} }
if (isStale) { if (isStale) {
args->ThrowError("bookmarkDataIsStale - try recreating the bookmark"); gin_helper::ErrorThrower(args->isolate())
.ThrowError("bookmarkDataIsStale - try recreating the bookmark");
} }
if (error == nil && isStale == false) { if (error == nil && isStale == false) {

2
shell/browser/browser.cc
View file

@ -72,7 +72,7 @@ void Browser::Quit() {
electron::WindowList::CloseAllWindows(); electron::WindowList::CloseAllWindows();
} }
void Browser::Exit(gin_helper::Arguments* args) { void Browser::Exit(gin::Arguments* args) {
int code = 0; int code = 0;
args->GetNext(&code); args->GetNext(&code);

12
shell/browser/browser.h
View file

@ -57,13 +57,13 @@ class Browser : public WindowListObserver {
void Quit(); void Quit();
// Exit the application immediately and set exit code. // Exit the application immediately and set exit code.
void Exit(gin_helper::Arguments* args); void Exit(gin::Arguments* args);
// Cleanup everything and shutdown the application gracefully. // Cleanup everything and shutdown the application gracefully.
void Shutdown(); void Shutdown();
// Focus the application. // Focus the application.
void Focus(gin_helper::Arguments* args); void Focus(gin::Arguments* args);
// Returns the version of the executable (or bundle). // Returns the version of the executable (or bundle).
std::string GetVersion() const; std::string GetVersion() const;
@ -88,15 +88,15 @@ class Browser : public WindowListObserver {
// Remove the default protocol handler registry key // Remove the default protocol handler registry key
bool RemoveAsDefaultProtocolClient(const std::string& protocol, bool RemoveAsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args); gin::Arguments* args);
// Set as default handler for a protocol. // Set as default handler for a protocol.
bool SetAsDefaultProtocolClient(const std::string& protocol, bool SetAsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args); gin::Arguments* args);
// Query the current state of default handler for a protocol. // Query the current state of default handler for a protocol.
bool IsDefaultProtocolClient(const std::string& protocol, bool IsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args); gin::Arguments* args);
base::string16 GetApplicationNameForProtocol(const GURL& url); base::string16 GetApplicationNameForProtocol(const GURL& url);
@ -140,7 +140,7 @@ class Browser : public WindowListObserver {
// Creates an activity and sets it as the one currently in use. // Creates an activity and sets it as the one currently in use.
void SetUserActivity(const std::string& type, void SetUserActivity(const std::string& type,
base::DictionaryValue user_info, base::DictionaryValue user_info,
gin_helper::Arguments* args); gin::Arguments* args);
// Returns the type name of the current user activity. // Returns the type name of the current user activity.
std::string GetCurrentActivityType(); std::string GetCurrentActivityType();

8
shell/browser/browser_linux.cc
View file

@ -84,7 +84,7 @@ bool SetDefaultWebClient(const std::string& protocol) {
return ran_ok && exit_code == EXIT_SUCCESS; return ran_ok && exit_code == EXIT_SUCCESS;
} }
void Browser::Focus(gin_helper::Arguments* args) { void Browser::Focus(gin::Arguments* args) {
// Focus on the first visible window. // Focus on the first visible window.
for (auto* const window : WindowList::GetWindows()) { for (auto* const window : WindowList::GetWindows()) {
if (window->IsVisible()) { if (window->IsVisible()) {
@ -101,12 +101,12 @@ void Browser::ClearRecentDocuments() {}
void Browser::SetAppUserModelID(const base::string16& name) {} void Browser::SetAppUserModelID(const base::string16& name) {}
bool Browser::SetAsDefaultProtocolClient(const std::string& protocol, bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args) { gin::Arguments* args) {
return SetDefaultWebClient(protocol); return SetDefaultWebClient(protocol);
} }
bool Browser::IsDefaultProtocolClient(const std::string& protocol, bool Browser::IsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args) { gin::Arguments* args) {
std::unique_ptr<base::Environment> env(base::Environment::Create()); std::unique_ptr<base::Environment> env(base::Environment::Create());
if (protocol.empty()) if (protocol.empty())
@ -128,7 +128,7 @@ bool Browser::IsDefaultProtocolClient(const std::string& protocol,
// Todo implement // Todo implement
bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol, bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args) { gin::Arguments* args) {
return false; return false;
} }

10
shell/browser/browser_mac.mm
View file

@ -95,7 +95,7 @@ void Browser::SetShutdownHandler(base::Callback<bool()> handler) {
[[AtomApplication sharedApplication] setShutdownHandler:std::move(handler)]; [[AtomApplication sharedApplication] setShutdownHandler:std::move(handler)];
} }
void Browser::Focus(gin_helper::Arguments* args) { void Browser::Focus(gin::Arguments* args) {
gin_helper::Dictionary opts; gin_helper::Dictionary opts;
bool steal_focus = false; bool steal_focus = false;
@ -134,7 +134,7 @@ void Browser::ClearRecentDocuments() {
} }
bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol, bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args) { gin::Arguments* args) {
NSString* identifier = [base::mac::MainBundle() bundleIdentifier]; NSString* identifier = [base::mac::MainBundle() bundleIdentifier];
if (!identifier) if (!identifier)
return false; return false;
@ -169,7 +169,7 @@ bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
} }
bool Browser::SetAsDefaultProtocolClient(const std::string& protocol, bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args) { gin::Arguments* args) {
if (protocol.empty()) if (protocol.empty())
return false; return false;
@ -184,7 +184,7 @@ bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
} }
bool Browser::IsDefaultProtocolClient(const std::string& protocol, bool Browser::IsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args) { gin::Arguments* args) {
if (protocol.empty()) if (protocol.empty())
return false; return false;
@ -226,7 +226,7 @@ bool Browser::SetBadgeCount(int count) {
void Browser::SetUserActivity(const std::string& type, void Browser::SetUserActivity(const std::string& type,
base::DictionaryValue user_info, base::DictionaryValue user_info,
gin_helper::Arguments* args) { gin::Arguments* args) {
std::string url_string; std::string url_string;
args->GetNext(&url_string); args->GetNext(&url_string);

21
shell/browser/browser_win.cc
View file

@ -4,11 +4,14 @@
#include "shell/browser/browser.h" #include "shell/browser/browser.h"
#include <windows.h> // windows.h must be included first // must come before other includes. fixes bad #defines from <shlwapi.h>.
#include "base/win/shlwapi.h" // NOLINT(build/include_order)
#include <atlbase.h> #include <windows.h> // NOLINT(build/include_order)
#include <shlobj.h>
#include <shobjidl.h> #include <atlbase.h> // NOLINT(build/include_order)
#include <shlobj.h> // NOLINT(build/include_order)
#include <shobjidl.h> // NOLINT(build/include_order)
#include "base/base_paths.h" #include "base/base_paths.h"
#include "base/file_version_info.h" #include "base/file_version_info.h"
@ -61,7 +64,7 @@ bool GetProcessExecPath(base::string16* exe) {
return true; return true;
} }
bool GetProtocolLaunchPath(gin_helper::Arguments* args, base::string16* exe) { bool GetProtocolLaunchPath(gin::Arguments* args, base::string16* exe) {
if (!args->GetNext(exe) && !GetProcessExecPath(exe)) { if (!args->GetNext(exe) && !GetProcessExecPath(exe)) {
return false; return false;
} }
@ -196,7 +199,7 @@ Browser::UserTask::UserTask() = default;
Browser::UserTask::UserTask(const UserTask&) = default; Browser::UserTask::UserTask(const UserTask&) = default;
Browser::UserTask::~UserTask() = default; Browser::UserTask::~UserTask() = default;
void Browser::Focus(gin_helper::Arguments* args) { void Browser::Focus(gin::Arguments* args) {
// On Windows we just focus on the first window found for this process. // On Windows we just focus on the first window found for this process.
DWORD pid = GetCurrentProcessId(); DWORD pid = GetCurrentProcessId();
EnumWindows(&WindowsEnumerationHandler, reinterpret_cast<LPARAM>(&pid)); EnumWindows(&WindowsEnumerationHandler, reinterpret_cast<LPARAM>(&pid));
@ -338,7 +341,7 @@ bool Browser::SetUserTasks(const std::vector<UserTask>& tasks) {
} }
bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol, bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args) { gin::Arguments* args) {
if (protocol.empty()) if (protocol.empty())
return false; return false;
@ -400,7 +403,7 @@ bool Browser::RemoveAsDefaultProtocolClient(const std::string& protocol,
} }
bool Browser::SetAsDefaultProtocolClient(const std::string& protocol, bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args) { gin::Arguments* args) {
// HKEY_CLASSES_ROOT // HKEY_CLASSES_ROOT
// $PROTOCOL // $PROTOCOL
// (Default) = "URL:$NAME" // (Default) = "URL:$NAME"
@ -444,7 +447,7 @@ bool Browser::SetAsDefaultProtocolClient(const std::string& protocol,
} }
bool Browser::IsDefaultProtocolClient(const std::string& protocol, bool Browser::IsDefaultProtocolClient(const std::string& protocol,
gin_helper::Arguments* args) { gin::Arguments* args) {
if (protocol.empty()) if (protocol.empty())
return false; return false;