Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / extension_sync_service.h

diff --git a/src/chrome/browser/extensions/extension_sync_service.h b/src/chrome/browser/extensions/extension_sync_service.h
index c5eb9d4..0b359d7 100644 (file)
--- a/src/chrome/browser/extensions/extension_sync_service.h
+++ b/src/chrome/browser/extensions/extension_sync_service.h
@@ -43,7 +43,7 @@ class ExtensionSyncService : public syncer::SyncableService,
                        extensions::ExtensionPrefs* extension_prefs,
                        ExtensionService* extension_service);
 
-  virtual ~ExtensionSyncService();
+  ~ExtensionSyncService() override;
 
   // Convenience function to get the ExtensionSyncService for a Profile.
   static ExtensionSyncService* Get(Profile* profile);
@@ -58,17 +58,16 @@ class ExtensionSyncService : public syncer::SyncableService,
       const extensions::Extension& extension);
 
   // syncer::SyncableService implementation.
-  virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
+  syncer::SyncMergeResult MergeDataAndStartSyncing(
       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(syncer::ModelType type) OVERRIDE;
-  virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const OVERRIDE;
-  virtual syncer::SyncError ProcessSyncChanges(
+      scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override;
+  void StopSyncing(syncer::ModelType type) override;
+  syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const override;
+  syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      const syncer::SyncChangeList& change_list) override;
 
   // Gets the sync data for the given extension, assuming that the extension is
   // syncable.