components/content_settings/core/browser/content_settings_provider.h - Issue 579673003: Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo…

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_provider.h

Issue 579673003: Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

« components/content_settings.gypi ('K') | « components/content_settings/core/browser/content_settings_observer.h ('k') | components/content_settings/core/browser/content_settings_rule.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

similarity index 91%

rename from chrome/browser/content_settings/content_settings_provider.h

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

index 48e15ccb11b158c81f2769645fe04197d7b0841a..a51ed5246ac231a059940194ed74b710fa4814ec 100644

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

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

@@ -4,13 +4,12 @@

// Interface for objects providing content setting rules.

-#ifndef CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PROVIDER_H_

-#define CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PROVIDER_H_

+#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PROVIDER_H_

+#define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PROVIDER_H_

#define NO_RESOURCE_IDENTIFIER std::string()

#include <string>

-#include <vector>

#include "base/values.h"

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

@@ -73,4 +72,4 @@ class ProviderInterface {

} // namespace content_settings

-#endif // CHROME_BROWSER_CONTENT_SETTINGS_CONTENT_SETTINGS_PROVIDER_H_

+#endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_CONTENT_SETTINGS_PROVIDER_H_