chrome/browser/ui/website_settings/website_settings.cc - Issue 670953006: Componentize HostContentSettingsMap and content settings providers.

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 670953006: Componentize HostContentSettingsMap and content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: win64 suppress warnings Created 6 years, 2 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/ui/views/content_setting_bubble_contents.cc ('k') | chrome/browser/ui/website_settings/website_settings_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 f19d2b0c32d7377af28621cf8e011910d477b608..96ef0e3771c88478960eaee9de414588187f8b8f 100644

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

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

@@ -22,8 +22,6 @@

#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/content_settings_utils.h"

-#include "chrome/browser/content_settings/host_content_settings_map.h"

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

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

#include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"

@@ -34,6 +32,8 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

+#include "components/content_settings/core/browser/content_settings_utils.h"

+#include "components/content_settings/core/browser/host_content_settings_map.h"

#include "components/content_settings/core/browser/local_shared_objects_counter.h"

#include "components/content_settings/core/common/content_settings_pattern.h"

#include "content/public/browser/browser_thread.h"