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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/content_setting_image_model.cc

Issue 3299020: Remove vestigial cookie/web app permissions prompting UI now that the async U... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/content_setting_combo_model.cc ('k') | chrome/browser/cookie_modal_dialog.h » ('j') | chrome/browser/net/chrome_cookie_policy.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_setting_image_model.cc
===================================================================
--- chrome/browser/content_setting_image_model.cc (revision 59533)
+++ chrome/browser/content_setting_image_model.cc (working copy)
@@ -92,9 +92,7 @@
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())) {
« no previous file with comments | « chrome/browser/content_setting_combo_model.cc ('k') | chrome/browser/cookie_modal_dialog.h » ('j') | chrome/browser/net/chrome_cookie_policy.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698