diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 20:21:04 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 20:21:04 +0000 |
| commit | 5d9163e2136f0b4eef4aac3e650f1b6e655118fd (patch) | |
| tree | ed86b9c0422989d8c4d90cf628ca9f6239bd5d8b /chrome/browser/host_content_settings_map.cc | |
| parent | 87c23d51618a288127eed63419e4f26d770f74c5 (diff) | |
| download | chromium_src-5d9163e2136f0b4eef4aac3e650f1b6e655118fd.zip chromium_src-5d9163e2136f0b4eef4aac3e650f1b6e655118fd.tar.gz chromium_src-5d9163e2136f0b4eef4aac3e650f1b6e655118fd.tar.bz2 | |
Remove vestigial cookie/web app permissions prompting UI now that the async UI has been approved for M7.This allows me to more easily change the way the appmodal dialog system works.
http://crbug.com/55121
TEST=existing tests
Review URL: http://codereview.chromium.org/3299020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/host_content_settings_map.cc')
| -rw-r--r-- | chrome/browser/host_content_settings_map.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/host_content_settings_map.cc b/chrome/browser/host_content_settings_map.cc index c018219..e5c8bc4 100644 --- a/chrome/browser/host_content_settings_map.cc +++ b/chrome/browser/host_content_settings_map.cc @@ -804,13 +804,10 @@ void HostContentSettingsMap::GetSettingsFromDictionary( } } } - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableCookiePrompt)) { - // Migrate obsolete cookie prompt mode. - if (settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] == - CONTENT_SETTING_ASK) - settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] = CONTENT_SETTING_BLOCK; - } + // Migrate obsolete cookie prompt mode. + if (settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] == + CONTENT_SETTING_ASK) + settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] = CONTENT_SETTING_BLOCK; } void HostContentSettingsMap::GetResourceSettingsFromDictionary( |