chrome/browser/tab_contents/tab_contents.cc - Issue 2878075: Introduce a resource identifier for content settings.

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/tab_contents/tab_contents.cc

Issue 2878075: Introduce a resource identifier for content settings. (Closed)

Patch Set: updates Created 10 years, 4 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:

Index: chrome/browser/tab_contents/tab_contents.cc

diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc

index 7f3e7aa93bb35ab45ddcef79239243712124527a..29926127a1b0b20c1a21a5f74b16b1f5890c38e0 100644

--- a/chrome/browser/tab_contents/tab_contents.cc

+++ b/chrome/browser/tab_contents/tab_contents.cc

@@ -1440,7 +1440,7 @@ void TabContents::AddPopup(TabContents* new_contents,

if (creator.is_valid() &&

profile()->GetHostContentSettingsMap()->GetContentSetting(

- creator, CONTENT_SETTINGS_TYPE_POPUPS) == CONTENT_SETTING_ALLOW) {

+ creator, CONTENT_SETTINGS_TYPE_POPUPS, "") == CONTENT_SETTING_ALLOW) {

AddNewContents(new_contents, NEW_POPUP, initial_pos, true);

} else {

if (!blocked_popups_)