chrome/browser/content_setting_bubble_model.cc - Issue 3299020: Remove vestigial cookie/web app permissions prompting UI now that the async U...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_setting_bubble_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_exceptions_table_model.cc ('k') | chrome/browser/content_setting_combo_model.h » ('j') | chrome/browser/net/chrome_cookie_policy.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_setting_bubble_model.cc

===================================================================

--- chrome/browser/content_setting_bubble_model.cc (revision 59533)

+++ chrome/browser/content_setting_bubble_model.cc (working copy)

@@ -88,9 +88,7 @@

tab_contents()->GetTabSpecificContentSettings()->IsContentAccessed(

content_type()) &&

!tab_contents()->GetTabSpecificContentSettings()->IsContentBlocked(

- content_type()) &&

- !CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableCookiePrompt)) {

+ content_type())) {

title_ids = kAccessedTitleIDs;

} else if (!bubble_content().resource_identifiers.empty()) {

title_ids = kResourceSpecificBlockedTitleIDs;

@@ -127,9 +125,7 @@

Profile* profile,

ContentSettingsType content_type)

: ContentSettingTitleAndLinkModel(tab_contents, profile, content_type) {

- if (!CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableCookiePrompt))

- SetInfoLink();

+ SetInfoLink();

}

private: