diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 00:08:48 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 00:08:48 +0000 |
| commit | 8a62faa4ae13ed0f124655636fb4a4b98c7c8d31 (patch) | |
| tree | b69d48d0717833fe85b2ccc49fdeeea6a98bff60 /chrome/browser/content_settings/host_content_settings_map.cc | |
| parent | 2c52e39b530ae6b590e80f1e55273c8f5f541a4d (diff) | |
| download | chromium_src-8a62faa4ae13ed0f124655636fb4a4b98c7c8d31.zip chromium_src-8a62faa4ae13ed0f124655636fb4a4b98c7c8d31.tar.gz chromium_src-8a62faa4ae13ed0f124655636fb4a4b98c7c8d31.tar.bz2 | |
Move click-to-play out of chrome://flags.
This makes the click-to-play feature available in content settings without having to enable it in chrome://flags.
BUG=62084
TEST=none
Review URL: http://codereview.chromium.org/9293008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings/host_content_settings_map.cc')
| -rw-r--r-- | chrome/browser/content_settings/host_content_settings_map.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index e73553a..7a00e90 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -330,9 +330,6 @@ bool HostContentSettingsMap::IsSettingAllowedForType( case CONTENT_SETTINGS_TYPE_COOKIES: return setting == CONTENT_SETTING_SESSION_ONLY; case CONTENT_SETTINGS_TYPE_PLUGINS: - return setting == CONTENT_SETTING_ASK && - CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableClickToPlay); case CONTENT_SETTINGS_TYPE_GEOLOCATION: case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: case CONTENT_SETTINGS_TYPE_INTENTS: |