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

Unified Diff: chrome/browser/extensions/settings/settings_backend.h

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 6 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
Index: chrome/browser/extensions/settings/settings_backend.h
diff --git a/chrome/browser/extensions/settings/settings_backend.h b/chrome/browser/extensions/settings/settings_backend.h
index 3e9d833c75c1224e749064831f12a2053700faee..1cc2cc9b21ce2a704c8c6185885f668e6fc842ed 100644
--- a/chrome/browser/extensions/settings/settings_backend.h
+++ b/chrome/browser/extensions/settings/settings_backend.h
@@ -50,16 +50,16 @@ class SettingsBackend : public syncer::SyncableService {
// syncer::SyncableService implementation.
virtual syncer::SyncDataList GetAllSyncData(
- syncable::ModelType type) const OVERRIDE;
+ syncer::ModelType type) const OVERRIDE;
virtual syncer::SyncError MergeDataAndStartSyncing(
- syncable::ModelType type,
+ syncer::ModelType type,
const syncer::SyncDataList& initial_sync_data,
scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE;
virtual syncer::SyncError ProcessSyncChanges(
const tracked_objects::Location& from_here,
const syncer::SyncChangeList& change_list) OVERRIDE;
- virtual void StopSyncing(syncable::ModelType type) OVERRIDE;
+ virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
private:
// Gets a weak reference to the storage area for a given extension,
@@ -96,7 +96,7 @@ class SettingsBackend : public syncer::SyncableService {
// Current sync model type. Will be UNSPECIFIED if sync hasn't been enabled
// yet, and either SETTINGS or APP_SETTINGS if it has been.
- syncable::ModelType sync_type_;
+ syncer::ModelType sync_type_;
// Current sync processor, if any.
scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
« no previous file with comments | « chrome/browser/extensions/settings/settings_apitest.cc ('k') | chrome/browser/extensions/settings/settings_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698