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

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

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

similarity index 97%

rename from chrome/browser/content_settings/host_content_settings_map.h

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

index f60fd6af392f95ee27bc76d2dfdbbefd9c6bb6cd..b5482b1d379e9686c8b13fdf65ab37c67ee545a6 100644

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

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

@@ -5,8 +5,8 @@

// Maps hostnames to custom content settings. Written on the UI thread and read

// on any thread. One instance per profile.

-#ifndef CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_

-#define CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_

+#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_

+#define COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_

#include <map>

#include <string>

@@ -19,8 +19,8 @@

#include "base/threading/platform_thread.h"

#include "base/threading/thread_checker.h"

#include "base/tuple.h"

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

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

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

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

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

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

@@ -360,4 +360,4 @@ class HostContentSettingsMap

DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);

};

-#endif // CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_

+#endif // COMPONENTS_CONTENT_SETTINGS_CORE_BROWSER_HOST_CONTENT_SETTINGS_MAP_H_