Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

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: Removed redundant functions 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
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 9d1f8e9ab2d59ca024fefd4713a45037f9f7f096..6a833bc7eec794fbad34133f66137ce71a07225d 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,

Powered by Google App Engine
This is Rietveld 408576698