chrome/browser/content_settings/host_content_settings_map.h - Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory.

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/content_settings/host_content_settings_map.h

Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to parent Created 8 years, 4 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:

Index: chrome/browser/content_settings/host_content_settings_map.h

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

index 1ccdf44e6429fb5554618c4cbf671521fe586e24..845b58136488bd7d738a11b6fae4400d2d72692e 100644

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

+++ b/chrome/browser/content_settings/host_content_settings_map.h

@@ -16,11 +16,11 @@

#include "base/memory/ref_counted.h"

#include "base/synchronization/lock.h"

#include "base/tuple.h"

+#include "chrome/browser/api/prefs/pref_change_registrar.h"

#include "chrome/browser/content_settings/content_settings_observer.h"

-#include "chrome/browser/prefs/pref_change_registrar.h"

#include "chrome/common/content_settings.h"

-#include "chrome/common/content_settings_types.h"

#include "chrome/common/content_settings_pattern.h"

+#include "chrome/common/content_settings_types.h"

namespace base {

class Value;