s/global/session in constants

asd281533890 · Dec 5, 2017 · d9359d8 · d9359d8
1 parent d270731
commit d9359d8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/atom/browser/web_contents_preferences.cc b/atom/browser/web_contents_preferences.cc
@@ -143,7 +143,7 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
   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()) {
     if (base::FilePath(preloadPath).IsAbsolute())
-      command_line->AppendSwitchNative(switches::kGlobalPreloadScript,
+      command_line->AppendSwitchNative(switches::kSessionPreloadScript,
                                        preloadPath);
     else
       LOG(ERROR) << "preload script must have absolute path.";

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

diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h
@@ -91,7 +91,7 @@ extern const char kAppPath[];
 extern const char kBackgroundColor[];
 extern const char kPreloadScript[];
 extern const char kPreloadURL[];
-extern const char kGlobalPreloadScript[];
+extern const char kSessionPreloadScript[];
 extern const char kNodeIntegration[];
 extern const char kContextIsolation[];
 extern const char kGuestInstanceID[];

diff --git a/lib/renderer/init.js b/lib/renderer/init.js
@@ -87,7 +87,7 @@ for (let arg of process.argv) {
     appPath = arg.substr(arg.indexOf('=') + 1)
   } else if (arg.indexOf('--webview-tag=') === 0) {
     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))
   }
 }