diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 19:43:32 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 19:43:32 +0000 |
| commit | 6b979d200598627633c686ac9a7ac4d24ce14087 (patch) | |
| tree | 29b5a570b6ae03dffd5a2332de6a00e0979cb265 | |
| parent | 906947ffa421dad57b7e56528100846c43bba768 (diff) | |
| download | chromium_src-6b979d200598627633c686ac9a7ac4d24ce14087.zip chromium_src-6b979d200598627633c686ac9a7ac4d24ce14087.tar.gz chromium_src-6b979d200598627633c686ac9a7ac4d24ce14087.tar.bz2 | |
Remove --disable-images and --disable-javascript now that we have UI that does that.
This doesn't remove --disable-plugins or --disable-popup-blocking as various different test executables pass those and I'm not sure there's a way for them to set default pref values instead.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/593064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38914 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/tab_contents/render_view_host_delegate_helper.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc index 6ff76ee..7ce522d 100644 --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc +++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -168,7 +168,6 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs( !command_line.HasSwitch(switches::kDisableJava) && prefs->GetBoolean(prefs::kWebKitJavaEnabled); web_prefs.loads_images_automatically = - !command_line.HasSwitch(switches::kDisableImages) && prefs->GetBoolean(prefs::kWebKitLoadsImagesAutomatically); web_prefs.uses_page_cache = command_line.HasSwitch(switches::kEnableFastback); diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 89b4c59..70b4f62 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -107,9 +107,6 @@ const char kDisableHangMonitor[] = "disable-hang-monitor"; // This flag can be overidden by the "enable-ipv6" flag. const char kDisableIPv6[] = "disable-ipv6"; -// Prevent images from loading. -const char kDisableImages[] = "disable-images"; - // Don't execute JavaScript (browser JS like the new tab page still runs). const char kDisableJavaScript[] = "disable-javascript"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 5fa0fef..f7a3b92 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -45,7 +45,6 @@ extern const char kDisableDevTools[]; extern const char kDisableExtensions[]; extern const char kDisableHangMonitor[]; extern const char kDisableIPv6[]; -extern const char kDisableImages[]; extern const char kDisableJavaScript[]; extern const char kDisableJava[]; extern const char kDisableLocalStorage[]; |