github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changing command line option name

Browse Source
This commit is contained in:
Hari Krishna Reddy Juturu
2017-05-08 17:27:31 -07:00
parent 357caf8991
commit 3321f7d39c
9 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
atom/browser/web_contents_preferences.cc
View File

@@ -102,11 +102,11 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
command_line->AppendSwitch(switches::kNodeIntegrationInWorker);
// Check if webview tag creation is overriden.
bool enable_webview_override = false;
web_preferences.GetBoolean(options::kEnableWebViewOverride,
&enable_webview_override);
command_line->AppendSwitchASCII(switches::kEnableWebViewOverride,
enable_webview_override ? "true" : "false");
bool override_webview_security = false;
web_preferences.GetBoolean(options::kOverrideWebViewSecurity,
&override_webview_security);
command_line->AppendSwitchASCII(switches::kOverrideWebViewSecurity,
override_webview_security ? "true" : "false");
// If the `sandbox` option was passed to the BrowserWindow's webPreferences,
// pass `--enable-sandbox` to the renderer so it won't have any node.js

4
atom/common/options_switches.cc
View File

@@ -129,7 +129,7 @@ const char kDisableBlinkFeatures[] = "disableBlinkFeatures";
const char kNodeIntegrationInWorker[] = "nodeIntegrationInWorker";
// Enable the web view tag irrespective of node-integration setting.
const char kEnableWebViewOverride[] = "enableWebViewOverride";
const char kOverrideWebViewSecurity[] = "overrideWebViewSecurity";
} // namespace options
@@ -175,7 +175,7 @@ const char kGuestInstanceID[] = "guest-instance-id";
const char kOpenerID[] = "opener-id";
const char kScrollBounce[] = "scroll-bounce";
const char kHiddenPage[] = "hidden-page";
const char kEnableWebViewOverride[] = "enable-webview-override";
const char kOverrideWebViewSecurity[] = "override-webview-security";
// Command switch passed to renderer process to control nodeIntegration.
const char kNodeIntegrationInWorker[] = "node-integration-in-worker";

4
atom/common/options_switches.h
View File

@@ -64,7 +64,7 @@ extern const char kScrollBounce[];
extern const char kBlinkFeatures[];
extern const char kDisableBlinkFeatures[];
extern const char kNodeIntegrationInWorker[];
extern const char kEnableWebViewOverride[];
extern const char kOverrideWebViewSecurity[];
} // namespace options
@@ -94,7 +94,7 @@ extern const char kOpenerID[];
extern const char kScrollBounce[];
extern const char kHiddenPage[];
extern const char kNodeIntegrationInWorker[];
extern const char kEnableWebViewOverride[];
extern const char kOverrideWebViewSecurity[];
extern const char kWidevineCdmPath[];
extern const char kWidevineCdmVersion[];