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/content_setting_image_model.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/content_setting_image_model.cc')
| -rw-r--r-- | chrome/browser/content_setting_image_model.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/content_setting_image_model.cc b/chrome/browser/content_setting_image_model.cc index 0593991..84d19cd 100644 --- a/chrome/browser/content_setting_image_model.cc +++ b/chrome/browser/content_setting_image_model.cc @@ -92,9 +92,7 @@ void ContentSettingBlockedImageModel::UpdateFromTabContents( if (content_settings->IsContentBlocked(get_content_settings_type())) { icon_ids = kBlockedIconIDs; tooltip_ids = kBlockedTooltipIDs; - } else if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableCookiePrompt) && - tab_contents->profile()->GetHostContentSettingsMap()-> + } else if (tab_contents->profile()->GetHostContentSettingsMap()-> GetDefaultContentSetting(get_content_settings_type()) == CONTENT_SETTING_BLOCK && content_settings->IsContentAccessed(get_content_settings_type())) { |