chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc - Issue 106713004: Remove kEnableResourceContentSettings and all the code that uses it since it's been behind a flag f…

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/ui/blocked_content/popup_blocker_tab_helper.cc

Issue 106713004: Remove kEnableResourceContentSettings and all the code that uses it since it's been behind a flag f… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: review comments Created 7 years 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/ui/android/content_settings/popup_blocked_infobar_delegate.cc ('k') | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc

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

--- chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc (revision 239860)

+++ chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc (working copy)

@@ -96,7 +96,7 @@

if (blocked_popups_.size() < kMaximumNumberOfPopups) {

blocked_popups_.Add(new BlockedRequest(params, window_features));

TabSpecificContentSettings::FromWebContents(web_contents())->

- OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS, std::string());

+ OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS);

}

return true;

}

@@ -109,7 +109,7 @@

if (blocked_popups_.size() < kMaximumNumberOfPopups) {

blocked_popups_.Add(new BlockedRequest(nav_params, params.features()));

TabSpecificContentSettings::FromWebContents(web_contents())->

- OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS, std::string());

+ OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS);

}