chrome/browser/profiles/profile_io_data.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/profiles/profile_io_data.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/profiles/profile_io_data.cc

diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc

index 6c78ef52d89d320afddc804e79763d681bd72647..08885a38b53817f07a097e393b41e31b31ab6743 100644

--- a/chrome/browser/profiles/profile_io_data.cc

+++ b/chrome/browser/profiles/profile_io_data.cc

@@ -25,6 +25,7 @@

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

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

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

#include "chrome/browser/custom_handlers/protocol_handler_registry.h"

#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"

#include "chrome/browser/devtools/devtools_network_controller.h"

@@ -384,7 +385,8 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {

params->io_thread = g_browser_process->io_thread();

params->cookie_settings = CookieSettingsFactory::GetForProfile(profile);

- params->host_content_settings_map = profile->GetHostContentSettingsMap();

+ params->host_content_settings_map =

+ HostContentSettingsMapFactory::GetForProfile(profile);

params->ssl_config_service = profile->GetSSLConfigService();

#if defined(ENABLE_EXTENSIONS)