chrome/browser/extensions/api/content_settings/content_settings_api.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/extensions/api/content_settings/content_settings_api.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/engagement/site_engagement_service_factory.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

index c0845bbfbe5ab8e7bc4eb7a875abe2980236033b..0030797ab026950e9cab4f087aa0ec9dcef5816f 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

@@ -13,6 +13,7 @@

#include "base/strings/stringprintf.h"

#include "base/values.h"

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

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

#include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"

#include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"

#include "chrome/browser/extensions/api/content_settings/content_settings_service.h"

@@ -141,11 +142,12 @@ bool ContentSettingsContentSettingGetFunction::RunSync() {

error_ = keys::kIncognitoSessionOnlyError;

return false;

}

- map = GetProfile()->GetOffTheRecordProfile()->GetHostContentSettingsMap();

+ map = HostContentSettingsMapFactory::GetForProfile(

+ GetProfile()->GetOffTheRecordProfile());

cookie_settings = CookieSettingsFactory::GetForProfile(

GetProfile()->GetOffTheRecordProfile()).get();

} else {

- map = GetProfile()->GetHostContentSettingsMap();

+ map = HostContentSettingsMapFactory::GetForProfile(GetProfile());

cookie_settings = CookieSettingsFactory::GetForProfile(GetProfile()).get();

}