chrome/browser/profile_resetter/profile_resetter.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/profile_resetter/profile_resetter.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/prerender/prerender_browsertest.cc ('k') | chrome/browser/profile_resetter/profile_resetter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profile_resetter/profile_resetter.cc

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

index b96177e6dd5e4f3a088d188222470aaea4f44a4a..6b2d0afab38b7fa24abc4f4aa0c1bae6a78fcd23 100644

--- a/chrome/browser/profile_resetter/profile_resetter.cc

+++ b/chrome/browser/profile_resetter/profile_resetter.cc

@@ -10,7 +10,6 @@

#include "base/prefs/scoped_user_pref_update.h"

#include "base/synchronization/cancellation_flag.h"

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

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

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/google/google_url_tracker_factory.h"

#include "chrome/browser/profile_resetter/brandcoded_default_settings.h"

@@ -21,6 +20,7 @@

#include "chrome/browser/ui/tabs/tab_strip_model.h"

#include "chrome/common/pref_names.h"

#include "chrome/installer/util/browser_distribution.h"

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

#include "components/google/core/browser/google_pref_names.h"

#include "components/google/core/browser/google_url_tracker.h"

#include "components/search_engines/search_engines_pref_names.h"

« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/profile_resetter/profile_resetter_unittest.cc » ('j') | no next file with comments »