chrome/browser/profiles/profile_manager.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/profiles/profile_manager.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/profiles/profile_io_data.cc ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_manager.cc

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

index 0ce15038b77936e905c45f20a7992e806a791379..6e02f6b5e271c2562110e0f1302a5e3f424c8000 100644

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

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

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

#include "chrome/browser/bookmarks/bookmark_model_factory.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

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

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

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

#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"

@@ -52,6 +51,7 @@

#include "chrome/common/url_constants.h"

#include "chrome/grit/generated_resources.h"

#include "components/bookmarks/browser/bookmark_model.h"

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

#include "components/password_manager/core/browser/password_store.h"

#include "components/signin/core/common/profile_management_switches.h"

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