chrome/browser/ui/website_settings/website_settings.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/website_settings/website_settings.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/ui/website_settings/website_settings.cc

diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc

index d8446f80b229fcf99cbc5c407e277de0bb3e7ed4..592a95b99fe9e346c9ad88ba6900c315805ff20b 100644

--- a/chrome/browser/ui/website_settings/website_settings.cc

+++ b/chrome/browser/ui/website_settings/website_settings.cc

@@ -22,6 +22,7 @@

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

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

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

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

#include "chrome/browser/history/history_service_factory.h"

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

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

@@ -164,7 +165,7 @@ WebsiteSettings::WebsiteSettings(

cert_id_(0),

site_connection_status_(SITE_CONNECTION_STATUS_UNKNOWN),

cert_store_(cert_store),

- content_settings_(profile->GetHostContentSettingsMap()),

+ content_settings_(HostContentSettingsMapFactory::GetForProfile(profile)),

chrome_ssl_host_state_delegate_(

ChromeSSLHostStateDelegateFactory::GetForProfile(profile)),

did_revoke_user_ssl_decisions_(false) {