Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: base/prefs/pref_service.h

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, merge to LKGR. Created 7 years, 10 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 | « base/prefs/pref_registry_simple.cc ('k') | base/prefs/pref_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/prefs/pref_service.h
diff --git a/chrome/browser/prefs/pref_service.h b/base/prefs/pref_service.h
similarity index 97%
rename from chrome/browser/prefs/pref_service.h
rename to base/prefs/pref_service.h
index 9ea3787751571ab5275358c392088c09fd483aa1..98a9a161921316b913b4b63957bdd2ccfff1aa3c 100644
--- a/chrome/browser/prefs/pref_service.h
+++ b/base/prefs/pref_service.h
@@ -8,17 +8,19 @@
// information and MUST not be extracted, overwritten or modified except
// through Chromium defined APIs.
-#ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_H_
-#define CHROME_BROWSER_PREFS_PREF_SERVICE_H_
+#ifndef BASE_PREFS_PREF_SERVICE_H_
+#define BASE_PREFS_PREF_SERVICE_H_
#include <set>
#include <string>
#include "base/callback.h"
+#include "base/compiler_specific.h"
#include "base/hash_tables.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
+#include "base/prefs/base_prefs_export.h"
#include "base/prefs/persistent_pref_store.h"
#include "base/prefs/public/pref_service_base.h"
#include "base/threading/non_thread_safe.h"
@@ -37,7 +39,8 @@ class ScopedUserPrefUpdateBase;
// Base class for PrefServices. You can use the base class to read and
// interact with preferences, but not to register new preferences; for
// that see e.g. PrefRegistrySimple.
-class PrefService : public PrefServiceBase, public base::NonThreadSafe {
+class BASE_PREFS_EXPORT PrefService : public NON_EXPORTED_BASE(PrefServiceBase),
+ public base::NonThreadSafe {
public:
enum PrefInitializationStatus {
INITIALIZATION_STATUS_WAITING,
@@ -256,4 +259,4 @@ class PrefService : public PrefServiceBase, public base::NonThreadSafe {
DISALLOW_COPY_AND_ASSIGN(PrefService);
};
-#endif // CHROME_BROWSER_PREFS_PREF_SERVICE_H_
+#endif // BASE_PREFS_PREF_SERVICE_H_
« no previous file with comments | « base/prefs/pref_registry_simple.cc ('k') | base/prefs/pref_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698