diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-06 20:59:15 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-06 20:59:15 +0000 |
| commit | 58adf848df7ad7a724be0526e25196ba6adee0e9 (patch) | |
| tree | be019ccbc5b0778ab24423fc568b710d8e57cbaf /chrome/browser/tab_contents | |
| parent | 9b05174501e3d9da6da4a2473aa666c48366401b (diff) | |
| download | chromium_src-58adf848df7ad7a724be0526e25196ba6adee0e9.zip chromium_src-58adf848df7ad7a724be0526e25196ba6adee0e9.tar.gz chromium_src-58adf848df7ad7a724be0526e25196ba6adee0e9.tar.bz2 | |
Add a command line option --disable-web-security. People can use this option when the same-origin policy interferes with testing their web sites.
R=deanm
BUG=6449
Review URL: http://codereview.chromium.org/20101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/web_contents.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc index f0f39bf..ec55a6c 100644 --- a/chrome/browser/tab_contents/web_contents.cc +++ b/chrome/browser/tab_contents/web_contents.cc @@ -241,6 +241,8 @@ void WebContents::RegisterUserPrefs(PrefService* prefs) { 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, @@ -1204,6 +1206,9 @@ WebPreferences WebContents::GetWebkitPrefs() { 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); |