| Index: chrome/browser/tab_contents/web_contents.cc
|
| ===================================================================
|
| --- chrome/browser/tab_contents/web_contents.cc (revision 9212)
|
| +++ chrome/browser/tab_contents/web_contents.cc (working copy)
|
| @@ -235,6 +235,8 @@
|
| WebPreferences pref_defaults;
|
| prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled,
|
| pref_defaults.javascript_enabled);
|
| + prefs->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled,
|
| + pref_defaults.web_security_enabled);
|
| prefs->RegisterBooleanPref(
|
| prefs::kWebKitJavascriptCanOpenWindowsAutomatically, true);
|
| prefs->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically,
|
| @@ -1197,6 +1199,9 @@
|
| web_prefs.javascript_enabled =
|
| !command_line.HasSwitch(switches::kDisableJavaScript) &&
|
| prefs->GetBoolean(prefs::kWebKitJavascriptEnabled);
|
| + web_prefs.web_security_enabled =
|
| + !command_line.HasSwitch(switches::kDisableWebSecurity) &&
|
| + prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled);
|
| web_prefs.plugins_enabled =
|
| !command_line.HasSwitch(switches::kDisablePlugins) &&
|
| prefs->GetBoolean(prefs::kWebKitPluginsEnabled);
|
|
|