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

Unified Diff: chrome/browser/extensions/extension_service.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/extension_service.h
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index c2b00899bc23aaffef231cdb48ba417fcc997b47..0b055b8a2d98040ba03827d93bae97ced57fdb03 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -422,13 +422,13 @@ class ExtensionService
// syncer::SyncableService implementation.
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 void StopSyncing(syncable::ModelType type) OVERRIDE;
+ virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
virtual syncer::SyncDataList GetAllSyncData(
- syncable::ModelType type) const OVERRIDE;
+ syncer::ModelType type) const OVERRIDE;
virtual syncer::SyncError ProcessSyncChanges(
const tracked_objects::Location& from_here,
const syncer::SyncChangeList& change_list) OVERRIDE;
@@ -653,7 +653,7 @@ class ExtensionService
// Return true if the sync type of |extension| matches |type|.
bool IsCorrectSyncType(const extensions::Extension& extension,
- syncable::ModelType type)
+ syncer::ModelType type)
const;
// Handles setting the extension specific values in |extension_sync_data| to
@@ -662,7 +662,7 @@ class ExtensionService
// tried again later.
bool ProcessExtensionSyncDataHelper(
const extensions::ExtensionSyncData& extension_sync_data,
- syncable::ModelType type);
+ syncer::ModelType type);
// Look up an extension by ID, optionally including either or both of enabled
// and disabled extensions.
« no previous file with comments | « chrome/browser/extensions/app_notification_manager_sync_unittest.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698