chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.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/browsing_data/cookies_tree_model_unittest.cc ('k') | chrome/browser/chromeos/attestation/platform_verification_flow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 23ca026fd365d2e4313c083d989736d5e2d2a606..3cc7c853d0a52827432c1afe12ba631978961bd9 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -27,9 +27,7 @@

#include "chrome/browser/chrome_content_browser_client_parts.h"

#include "chrome/browser/chrome_net_benchmarking_message_filter.h"

#include "chrome/browser/chrome_quota_permission_context.h"

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

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

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

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

#include "chrome/browser/defaults.h"

#include "chrome/browser/download/download_prefs.h"

@@ -92,6 +90,8 @@

#include "components/cdm/browser/cdm_message_filter_android.h"

#include "components/cloud_devices/common/cloud_devices_switches.h"

#include "components/content_settings/core/browser/content_settings_provider.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/common/content_settings.h"

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

#include "components/dom_distiller/core/url_constants.h"