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

Remove unnecessary methods on WebContentsPreferences

Browse source
This commit is contained in:
Cheng Zhao 2018-02-13 15:57:54 +09:00
parent 2b623f5d86
commit affa21600c
5 changed files with 36 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

44
atom/browser/web_contents_preferences.cc
View file

@ -112,7 +112,8 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
// 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
// integration.
if (IsSandboxed(web_contents)) {
bool sandbox = false;
if (web_preferences.GetBoolean("sandbox", &sandbox) && sandbox) {
command_line->AppendSwitch(switches::kEnableSandbox);
} else if (!command_line->HasSwitch(switches::kEnableSandbox)) {
command_line->AppendSwitch(::switches::kNoSandbox);
@ -237,47 +238,6 @@ bool WebContentsPreferences::IsPreferenceEnabled(
return bool_value;
}
bool WebContentsPreferences::GetPreferenceString(
const std::string& attribute_name,
content::WebContents* web_contents,
std::string* strValue) {
WebContentsPreferences* self;
if (!web_contents)
return false;
self = FromWebContents(web_contents);
if (!self)
return false;
base::DictionaryValue& web_preferences = self->web_preferences_;
return web_preferences.GetString(attribute_name, strValue);
}
bool WebContentsPreferences::IsSandboxed(content::WebContents* web_contents) {
return IsPreferenceEnabled("sandbox", web_contents);
}
bool WebContentsPreferences::UsesNativeWindowOpen(
content::WebContents* web_contents) {
return IsPreferenceEnabled("nativeWindowOpen", web_contents);
}
bool WebContentsPreferences::IsPluginsEnabled(
content::WebContents* web_contents) {
return IsPreferenceEnabled("plugins", web_contents);
}
bool WebContentsPreferences::DisablePopups(
content::WebContents* web_contents) {
return IsPreferenceEnabled("disablePopups", web_contents);
}
bool WebContentsPreferences::GetAffinity(
content::WebContents* web_contents,
std::string* string_value) {
return GetPreferenceString("affinity", web_contents, string_value);
}
// static
void WebContentsPreferences::OverrideWebkitPrefs(
content::WebContents* web_contents, content::WebPreferences* prefs) {