Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / supervised_user / supervised_user_shared_settings_service.h

diff --git a/src/chrome/browser/supervised_user/supervised_user_shared_settings_service.h b/src/chrome/browser/supervised_user/supervised_user_shared_settings_service.h
index 4a54f78..a1d588a 100644 (file)
--- a/src/chrome/browser/supervised_user/supervised_user_shared_settings_service.h
+++ b/src/chrome/browser/supervised_user/supervised_user_shared_settings_service.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_SERVICE_H_
 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_SERVICE_H_
 
+#include <string>
+
 #include "base/callback.h"
 #include "base/callback_list.h"
 #include "base/memory/scoped_ptr.h"
@@ -49,7 +51,7 @@ class SupervisedUserSharedSettingsService : public KeyedService,
   // |SupervisedUserSharedSettingsServiceFactory::GetForProfile(...)| instead to
   // get an instance of this service in production code.
   explicit SupervisedUserSharedSettingsService(PrefService* prefs);
-  virtual ~SupervisedUserSharedSettingsService();
+  ~SupervisedUserSharedSettingsService() override;
 
   // Returns the value for the given |key| and the supervised user identified by
   // |su_id|. If either the supervised user or the key does not exist, NULL is
@@ -87,20 +89,19 @@ class SupervisedUserSharedSettingsService : public KeyedService,
                                                    bool acknowledged);
 
   // KeyedService implementation:
-  virtual void Shutdown() OVERRIDE;
+  void Shutdown() override;
 
   // 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> error_handler) 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> error_handler) 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;
 
  private:
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;