Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(756)

Side by Side Diff: chrome/browser/tab_contents/web_contents.cc

Issue 20101: Add a command line option --disable-web-security. People can use this option... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/tab_contents/web_contents.h" 5 #include "chrome/browser/tab_contents/web_contents.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_version_info.h" 9 #include "base/file_version_info.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 NotificationService::AllSources()); 228 NotificationService::AllSources());
229 } 229 }
230 230
231 // static 231 // static
232 void WebContents::RegisterUserPrefs(PrefService* prefs) { 232 void WebContents::RegisterUserPrefs(PrefService* prefs) {
233 prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true); 233 prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true);
234 234
235 WebPreferences pref_defaults; 235 WebPreferences pref_defaults;
236 prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled, 236 prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled,
237 pref_defaults.javascript_enabled); 237 pref_defaults.javascript_enabled);
238 prefs->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled,
239 pref_defaults.web_security_enabled);
238 prefs->RegisterBooleanPref( 240 prefs->RegisterBooleanPref(
239 prefs::kWebKitJavascriptCanOpenWindowsAutomatically, true); 241 prefs::kWebKitJavascriptCanOpenWindowsAutomatically, true);
240 prefs->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically, 242 prefs->RegisterBooleanPref(prefs::kWebKitLoadsImagesAutomatically,
241 pref_defaults.loads_images_automatically); 243 pref_defaults.loads_images_automatically);
242 prefs->RegisterBooleanPref(prefs::kWebKitPluginsEnabled, 244 prefs->RegisterBooleanPref(prefs::kWebKitPluginsEnabled,
243 pref_defaults.plugins_enabled); 245 pref_defaults.plugins_enabled);
244 prefs->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled, 246 prefs->RegisterBooleanPref(prefs::kWebKitDomPasteEnabled,
245 pref_defaults.dom_paste_enabled); 247 pref_defaults.dom_paste_enabled);
246 prefs->RegisterBooleanPref(prefs::kWebKitShrinksStandaloneImagesToFit, 248 prefs->RegisterBooleanPref(prefs::kWebKitShrinksStandaloneImagesToFit,
247 pref_defaults.shrinks_standalone_images_to_fit); 249 pref_defaults.shrinks_standalone_images_to_fit);
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 prefs->GetBoolean(prefs::kWebKitShrinksStandaloneImagesToFit); 1192 prefs->GetBoolean(prefs::kWebKitShrinksStandaloneImagesToFit);
1191 1193
1192 { // Command line switches are used for preferences with no user interface. 1194 { // Command line switches are used for preferences with no user interface.
1193 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 1195 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
1194 web_prefs.developer_extras_enabled = 1196 web_prefs.developer_extras_enabled =
1195 !command_line.HasSwitch(switches::kDisableDevTools) && 1197 !command_line.HasSwitch(switches::kDisableDevTools) &&
1196 prefs->GetBoolean(prefs::kWebKitDeveloperExtrasEnabled); 1198 prefs->GetBoolean(prefs::kWebKitDeveloperExtrasEnabled);
1197 web_prefs.javascript_enabled = 1199 web_prefs.javascript_enabled =
1198 !command_line.HasSwitch(switches::kDisableJavaScript) && 1200 !command_line.HasSwitch(switches::kDisableJavaScript) &&
1199 prefs->GetBoolean(prefs::kWebKitJavascriptEnabled); 1201 prefs->GetBoolean(prefs::kWebKitJavascriptEnabled);
1202 web_prefs.web_security_enabled =
1203 !command_line.HasSwitch(switches::kDisableWebSecurity) &&
1204 prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled);
1200 web_prefs.plugins_enabled = 1205 web_prefs.plugins_enabled =
1201 !command_line.HasSwitch(switches::kDisablePlugins) && 1206 !command_line.HasSwitch(switches::kDisablePlugins) &&
1202 prefs->GetBoolean(prefs::kWebKitPluginsEnabled); 1207 prefs->GetBoolean(prefs::kWebKitPluginsEnabled);
1203 web_prefs.java_enabled = 1208 web_prefs.java_enabled =
1204 !command_line.HasSwitch(switches::kDisableJava) && 1209 !command_line.HasSwitch(switches::kDisableJava) &&
1205 prefs->GetBoolean(prefs::kWebKitJavaEnabled); 1210 prefs->GetBoolean(prefs::kWebKitJavaEnabled);
1206 web_prefs.loads_images_automatically = 1211 web_prefs.loads_images_automatically =
1207 !command_line.HasSwitch(switches::kDisableImages) && 1212 !command_line.HasSwitch(switches::kDisableImages) &&
1208 prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically); 1213 prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically);
1209 web_prefs.uses_page_cache = 1214 web_prefs.uses_page_cache =
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
1748 // The favicon url isn't valid. This means there really isn't a favicon, 1753 // The favicon url isn't valid. This means there really isn't a favicon,
1749 // or the favicon url wasn't obtained before the load started. This assumes 1754 // or the favicon url wasn't obtained before the load started. This assumes
1750 // the later. 1755 // the later.
1751 // TODO(sky): Need a way to set the favicon that doesn't involve generating 1756 // TODO(sky): Need a way to set the favicon that doesn't involve generating
1752 // its url. 1757 // its url.
1753 new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer)); 1758 new_url->SetFavIconURL(TemplateURL::GenerateFaviconURL(params.referrer));
1754 } 1759 }
1755 new_url->set_safe_for_autoreplace(true); 1760 new_url->set_safe_for_autoreplace(true);
1756 url_model->Add(new_url); 1761 url_model->Add(new_url);
1757 } 1762 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698