summaryrefslogtreecommitdiffstats
path: root/components/prefs/pref_notifier.h
diff options
context:
space:
mode:
authormsw <msw@chromium.org>2016-02-02 17:25:06 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-03 01:26:34 +0000
commit456d842422a8cf9954ebeab7615059a0129812de (patch)
tree66113703585a40588dcb52d8bbf779805b8f3788 /components/prefs/pref_notifier.h
parent91375c125e08b6b53bb7c7e3eaedab1ef7c08a0b (diff)
downloadchromium_src-456d842422a8cf9954ebeab7615059a0129812de.zip
chromium_src-456d842422a8cf9954ebeab7615059a0129812de.tar.gz
chromium_src-456d842422a8cf9954ebeab7615059a0129812de.tar.bz2
Revert of Delete base/prefs and update callers to use components. (patchset #3 id:40001 of https://codereview.chromium.org/1662523004/ )
Reason for revert: Broke Win Builder compile: https://build.chromium.org/p/chromium.win/builders/Win%20Builder/builds/19463/steps/compile/logs/stdio Original issue's description: > Delete base/prefs and update callers to use components. > > Deletes the forwarding headers in base/prefs. > > Updates the remaining users of base/prefs includes to use components/prefs. > Sort headers in updated files. > > Move PrefServiceFactory out of the base namespace. Update users. > > Update all preprocessor stuff in components/prefs to change BASE_PREFS_ to > COMPONENTS_PREFS_. > > Add components/prefs to DEPS file of directories where checkdeps fails after > the update. > > BUG=583034 > > Committed: https://crrev.com/1f5feb7e317e3c257090858e950273b64a2e31ef > Cr-Commit-Position: refs/heads/master@{#373105} TBR=estade@chromium.org,brettw@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=583034 Review URL: https://codereview.chromium.org/1662843002 Cr-Commit-Position: refs/heads/master@{#373115}
Diffstat (limited to 'components/prefs/pref_notifier.h')
-rw-r--r--components/prefs/pref_notifier.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/prefs/pref_notifier.h b/components/prefs/pref_notifier.h
index 2abc213..e0df260 100644
--- a/components/prefs/pref_notifier.h
+++ b/components/prefs/pref_notifier.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 COMPONENTS_PREFS_PREF_NOTIFIER_H_
-#define COMPONENTS_PREFS_PREF_NOTIFIER_H_
+#ifndef BASE_PREFS_PREF_NOTIFIER_H_
+#define BASE_PREFS_PREF_NOTIFIER_H_
#include <string>
@@ -23,4 +23,4 @@ class PrefNotifier {
virtual void OnInitializationCompleted(bool succeeded) = 0;
};
-#endif // COMPONENTS_PREFS_PREF_NOTIFIER_H_
+#endif // BASE_PREFS_PREF_NOTIFIER_H_