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

s/global/session in constants

Browse source
This commit is contained in:
Samuel Attard 2017-09-17 01:10:01 +10:00 • committed by Cheng Zhao
parent d2707315e6
commit d9359d8b6c
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/web_contents_preferences.cc
View file

@ -143,7 +143,7 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
mate::Handle<atom::api::WebContents> api_web_contents = atom::api::WebContents::CreateFrom(isolate, web_contents); mate::Handle<atom::api::WebContents> api_web_contents = atom::api::WebContents::CreateFrom(isolate, web_contents);
for (auto preloadPath : atom::api::Session::CreateFrom(isolate, api_web_contents.get()->GetBrowserContext())->GetPreloads()) { for (auto preloadPath : atom::api::Session::CreateFrom(isolate, api_web_contents.get()->GetBrowserContext())->GetPreloads()) {
if (base::FilePath(preloadPath).IsAbsolute()) if (base::FilePath(preloadPath).IsAbsolute())
command_line->AppendSwitchNative(switches::kGlobalPreloadScript, command_line->AppendSwitchNative(switches::kSessionPreloadScript,
preloadPath); preloadPath);
else else
LOG(ERROR) << "preload script must have absolute path."; LOG(ERROR) << "preload script must have absolute path.";

24
atom/common/options_switches.cc
View file

@ -177,18 +177,18 @@ const char kAppUserModelId[] = "app-user-model-id";
const char kAppPath[] = "app-path"; const char kAppPath[] = "app-path";
// The command line switch versions of the options. // The command line switch versions of the options.
const char kBackgroundColor[] = "background-color"; const char kBackgroundColor[] = "background-color";
const char kPreloadScript[] = "preload"; const char kPreloadScript[] = "preload";
const char kPreloadURL[] = "preload-url"; const char kPreloadURL[] = "preload-url";
const char kGlobalPreloadScript[] = "global-preload"; const char kSessionPreloadScript[] = "session-preload";
const char kNodeIntegration[] = "node-integration"; const char kNodeIntegration[] = "node-integration";
const char kContextIsolation[] = "context-isolation"; const char kContextIsolation[] = "context-isolation";
const char kGuestInstanceID[] = "guest-instance-id"; const char kGuestInstanceID[] = "guest-instance-id";
const char kOpenerID[] = "opener-id"; const char kOpenerID[] = "opener-id";
const char kScrollBounce[] = "scroll-bounce"; const char kScrollBounce[] = "scroll-bounce";
const char kHiddenPage[] = "hidden-page"; const char kHiddenPage[] = "hidden-page";
const char kNativeWindowOpen[] = "native-window-open"; const char kNativeWindowOpen[] = "native-window-open";
const char kWebviewTag[] = "webview-tag"; const char kWebviewTag[] = "webview-tag";
// Command switch passed to renderer process to control nodeIntegration. // Command switch passed to renderer process to control nodeIntegration.
const char kNodeIntegrationInWorker[] = "node-integration-in-worker"; const char kNodeIntegrationInWorker[] = "node-integration-in-worker";

2
atom/common/options_switches.h
View file

@ -91,7 +91,7 @@ extern const char kAppPath[];
extern const char kBackgroundColor[]; extern const char kBackgroundColor[];
extern const char kPreloadScript[]; extern const char kPreloadScript[];
extern const char kPreloadURL[]; extern const char kPreloadURL[];
extern const char kGlobalPreloadScript[]; extern const char kSessionPreloadScript[];
extern const char kNodeIntegration[]; extern const char kNodeIntegration[];
extern const char kContextIsolation[]; extern const char kContextIsolation[];
extern const char kGuestInstanceID[]; extern const char kGuestInstanceID[];

2
lib/renderer/init.js
View file

@ -87,7 +87,7 @@ for (let arg of process.argv) {
appPath = arg.substr(arg.indexOf('=') + 1) appPath = arg.substr(arg.indexOf('=') + 1)
} else if (arg.indexOf('--webview-tag=') === 0) { } else if (arg.indexOf('--webview-tag=') === 0) {
webviewTag = arg.substr(arg.indexOf('=') + 1) webviewTag = arg.substr(arg.indexOf('=') + 1)
} else if (arg.indexOf('--global-preload') === 0) { } else if (arg.indexOf('--session-preload') === 0) {
sessionPreloadScripts.push(arg.substr(arg.indexOf('=') + 1)) sessionPreloadScripts.push(arg.substr(arg.indexOf('=') + 1))
} }
} }