chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc - Issue 1312453005: Removed Profile::GetHostContentSettingsMap

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 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed patch conflict Created 5 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/supervised_user/supervised_user_settings_service.h ('k') | chrome/browser/ui/app_list/test/fake_profile.h » ('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 66b4c50aca83759a16518476622b806980e8cc7d..b502d3a72a6bcd541c340448f075c6df2b0d6d0d 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

@@ -5,6 +5,7 @@

#include "chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.h"

#include "base/prefs/pref_service.h"

+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"

#include "chrome/browser/infobars/infobar_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"

@@ -27,7 +28,9 @@ void PopupBlockedInfoBarDelegate::Create(content::WebContents* web_contents,

InfoBarService::FromWebContents(web_contents);

scoped_ptr<infobars::InfoBar> infobar(infobar_service->CreateConfirmInfoBar(

scoped_ptr<ConfirmInfoBarDelegate>(new PopupBlockedInfoBarDelegate(

- num_popups, url, profile->GetHostContentSettingsMap()))));

+ num_popups,

+ url,

+ HostContentSettingsMapFactory::GetForProfile(profile)))));

// See if there is an existing popup infobar already.

// TODO(dfalcantara) When triggering more than one popup the infobar