chrome/browser/android/preferences/website_preference_bridge.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/android/preferences/website_preference_bridge.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:

Index: chrome/browser/android/preferences/website_preference_bridge.cc

diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc

index 5da7038dcf2fa46e930a91006c3844b3b0c69c93..d47f4c9b99cc7b94ee24e16faa0763054157edc2 100644

--- a/chrome/browser/android/preferences/website_preference_bridge.cc

+++ b/chrome/browser/android/preferences/website_preference_bridge.cc

@@ -15,6 +15,7 @@

#include "chrome/browser/browsing_data/cookies_tree_model.h"

#include "chrome/browser/browsing_data/local_data_container.h"

#include "chrome/browser/content_settings/cookie_settings_factory.h"

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

#include "chrome/browser/content_settings/web_site_settings_uma_util.h"

#include "chrome/browser/notifications/desktop_notification_profile_util.h"

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

@@ -43,7 +44,8 @@ static Profile* GetActiveUserProfile(bool is_incognito) {

}

static HostContentSettingsMap* GetHostContentSettingsMap(bool is_incognito) {

- return GetActiveUserProfile(is_incognito)->GetHostContentSettingsMap();

+ return HostContentSettingsMapFactory::GetForProfile(

+ GetActiveUserProfile(is_incognito));

}

static void GetOrigins(JNIEnv* env,