components/content_settings/core/browser/content_settings_pref_provider.h - 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: components/content_settings/core/browser/content_settings_pref_provider.h

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 | « components/content_settings/core/browser/content_settings_policy_provider.cc ('k') | components/content_settings/core/browser/content_settings_pref_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_pref_provider.h

diff --git a/chrome/browser/content_settings/content_settings_pref_provider.h b/components/content_settings/core/browser/content_settings_pref_provider.h

similarity index 92%

rename from chrome/browser/content_settings/content_settings_pref_provider.h

rename to components/content_settings/core/browser/content_settings_pref_provider.h

index 8ae666415598732a70db736b054be60d829c246c..9d715897c87cc8f80570a854cbac795fe2d55fc4 100644

--- a/chrome/browser/content_settings/content_settings_pref_provider.h

+++ b/components/content_settings/core/browser/content_settings_pref_provider.h

@@ -2,8 +2,8 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_

-#define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_

+#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_PROVIDER_H_

+#define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_PROVIDER_H_

// A content settings provider that takes its settings out of the pref service.

@@ -12,9 +12,9 @@

#include "base/basictypes.h"

#include "base/prefs/pref_change_registrar.h"

#include "base/synchronization/lock.h"

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

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

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

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

class PrefService;

@@ -123,4 +123,4 @@ class PrefProvider : public ObservableProvider {

} // namespace content_settings

-#endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PREF_PROVIDER_H_

+#endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PREF_PROVIDER_H_