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

Unified Diff: chrome/browser/sync/sync_prefs.h

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 8 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 | « chrome/browser/sync/profile_sync_service_preference_unittest.cc ('k') | chrome/browser/sync/sync_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/sync_prefs.h
diff --git a/chrome/browser/sync/sync_prefs.h b/chrome/browser/sync/sync_prefs.h
index e2598664429ed135db6913eb472d5ada5dde28aa..5b3e8cfd6cb9c1d52a4583a175adeea8d7fe0ec6 100644
--- a/chrome/browser/sync/sync_prefs.h
+++ b/chrome/browser/sync/sync_prefs.h
@@ -15,10 +15,13 @@
#include "sync/internal_api/public/base/model_type.h"
#include "sync/notifier/invalidation_state_tracker.h"
-class PrefRegistrySyncable;
class PrefService;
class ProfileIOData;
+namespace user_prefs {
+class PrefRegistrySyncable;
+}
+
namespace browser_sync {
class SyncPrefObserver {
@@ -54,7 +57,7 @@ class SyncPrefs : NON_EXPORTED_BASE(public base::NonThreadSafe),
virtual ~SyncPrefs();
- static void RegisterUserPrefs(PrefRegistrySyncable* registry);
+ static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);
// Checks if sync is enabled for the profile that owns |io_data|. This must
// be invoked on the IO thread, and can be used to check if sync is enabled
@@ -136,7 +139,9 @@ class SyncPrefs : NON_EXPORTED_BASE(public base::NonThreadSafe),
void RegisterPrefGroups();
static void RegisterDataTypePreferredPref(
- PrefRegistrySyncable* prefs, syncer::ModelType type, bool is_preferred);
+ user_prefs::PrefRegistrySyncable* prefs,
+ syncer::ModelType type,
+ bool is_preferred);
bool GetDataTypePreferred(syncer::ModelType type) const;
void SetDataTypePreferred(syncer::ModelType type, bool is_preferred);
« no previous file with comments | « chrome/browser/sync/profile_sync_service_preference_unittest.cc ('k') | chrome/browser/sync/sync_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698