| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef COMPONENTS_SYNCABLE_PREFS_PREF_SERVICE_SYNCABLE_H_ | 5 #ifndef COMPONENTS_SYNCABLE_PREFS_PREF_SERVICE_SYNCABLE_H_ | 
| 6 #define COMPONENTS_SYNCABLE_PREFS_PREF_SERVICE_SYNCABLE_H_ | 6 #define COMPONENTS_SYNCABLE_PREFS_PREF_SERVICE_SYNCABLE_H_ | 
| 7 | 7 | 
| 8 #include <stdint.h> | 8 #include <stdint.h> | 
| 9 | 9 | 
| 10 #include <vector> | 10 #include <vector> | 
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 66   // priority preferences. | 66   // priority preferences. | 
| 67   bool IsPrioritySyncing(); | 67   bool IsPrioritySyncing(); | 
| 68 | 68 | 
| 69   // Returns true if the pref under the given name is pulled down from sync. | 69   // Returns true if the pref under the given name is pulled down from sync. | 
| 70   // Note this does not refer to SYNCABLE_PREF. | 70   // Note this does not refer to SYNCABLE_PREF. | 
| 71   bool IsPrefSynced(const std::string& name) const; | 71   bool IsPrefSynced(const std::string& name) const; | 
| 72 | 72 | 
| 73   void AddObserver(PrefServiceSyncableObserver* observer); | 73   void AddObserver(PrefServiceSyncableObserver* observer); | 
| 74   void RemoveObserver(PrefServiceSyncableObserver* observer); | 74   void RemoveObserver(PrefServiceSyncableObserver* observer); | 
| 75 | 75 | 
|  | 76   void RegisterMergeDataFinishedCallback(const base::Closure& callback); | 
|  | 77 | 
| 76   // TODO(zea): Have PrefServiceSyncable implement | 78   // TODO(zea): Have PrefServiceSyncable implement | 
| 77   // syncer::SyncableService directly. | 79   // syncer::SyncableService directly. | 
| 78   syncer::SyncableService* GetSyncableService(const syncer::ModelType& type); | 80   syncer::SyncableService* GetSyncableService(const syncer::ModelType& type); | 
| 79 | 81 | 
| 80   // Do not call this after having derived an incognito or per tab pref service. | 82   // Do not call this after having derived an incognito or per tab pref service. | 
| 81   void UpdateCommandLinePrefStore(PrefStore* cmd_line_store) override; | 83   void UpdateCommandLinePrefStore(PrefStore* cmd_line_store) override; | 
| 82 | 84 | 
| 83   void AddSyncedPrefObserver(const std::string& name, | 85   void AddSyncedPrefObserver(const std::string& name, | 
| 84                              SyncedPrefObserver* observer); | 86                              SyncedPrefObserver* observer); | 
| 85   void RemoveSyncedPrefObserver(const std::string& name, | 87   void RemoveSyncedPrefObserver(const std::string& name, | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
| 110   PrefModelAssociator priority_pref_sync_associator_; | 112   PrefModelAssociator priority_pref_sync_associator_; | 
| 111 | 113 | 
| 112   base::ObserverList<PrefServiceSyncableObserver> observer_list_; | 114   base::ObserverList<PrefServiceSyncableObserver> observer_list_; | 
| 113 | 115 | 
| 114   DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncable); | 116   DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncable); | 
| 115 }; | 117 }; | 
| 116 | 118 | 
| 117 }  // namespace syncable_prefs | 119 }  // namespace syncable_prefs | 
| 118 | 120 | 
| 119 #endif  // COMPONENTS_SYNCABLE_PREFS_PREF_SERVICE_SYNCABLE_H_ | 121 #endif  // COMPONENTS_SYNCABLE_PREFS_PREF_SERVICE_SYNCABLE_H_ | 
| OLD | NEW | 
|---|