chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc - Issue 542253003: Add a global on/off switch for content settings and expose a toggle on the Website Settings options…

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/android/content_settings/popup_blocked_infobar_delegate.cc

Issue 542253003: Add a global on/off switch for content settings and expose a toggle on the Website Settings options… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@global-settings

Patch Set: Rebase. Created 6 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/resources/options/website_settings.js ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

diff --git a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

index 73efc8ce4812257d8b86d9de76f3968fd63e33c1..cef5b3ca9a61b0e637bfa117bec60c0853b9ba9a 100644

--- a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

+++ b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc

@@ -62,13 +62,8 @@ PopupBlockedInfoBarDelegate::PopupBlockedInfoBarDelegate(

HostContentSettingsMap* map)

: ConfirmInfoBarDelegate(), num_popups_(num_popups), url_(url), map_(map) {

content_settings::SettingInfo setting_info;

- scoped_ptr<base::Value> setting(

- map->GetWebsiteSetting(

- url,

- CONTENT_SETTINGS_TYPE_POPUPS,

- std::string(),

- &setting_info));

+ scoped_ptr<base::Value> setting = map->GetWebsiteSetting(

+ url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string(), &setting_info);

can_show_popups_ =

setting_info.source != content_settings::SETTING_SOURCE_POLICY;

}