Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / sync_driver / ui_data_type_controller.h

diff --git a/src/components/sync_driver/ui_data_type_controller.h b/src/components/sync_driver/ui_data_type_controller.h
index c1b80a9..dcade37 100644 (file)
--- a/src/components/sync_driver/ui_data_type_controller.h
+++ b/src/components/sync_driver/ui_data_type_controller.h
@@ -23,7 +23,7 @@ class SyncableService;
 class SyncError;
 }
 
-namespace browser_sync {
+namespace sync_driver {
 
 // Implementation for datatypes that reside on the (UI thread). This is the same
 // thread we perform initialization on, so we don't have to worry about thread
@@ -34,25 +34,22 @@ class UIDataTypeController : public DataTypeController {
   UIDataTypeController(
       scoped_refptr<base::MessageLoopProxy> ui_thread,
       const base::Closure& error_callback,
-      const DisableTypeCallback& disable_callback,
       syncer::ModelType type,
       SyncApiComponentFactory* sync_factory);
 
   // DataTypeController interface.
-  virtual void LoadModels(
-      const ModelLoadCallback& model_load_callback) OVERRIDE;
-  virtual void StartAssociating(const StartCallback& start_callback) OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual syncer::ModelType type() const OVERRIDE;
-  virtual syncer::ModelSafeGroup model_safe_group() const OVERRIDE;
-  virtual ChangeProcessor* GetChangeProcessor() const OVERRIDE;
-  virtual std::string name() const OVERRIDE;
-  virtual State state() const OVERRIDE;
+  void LoadModels(const ModelLoadCallback& model_load_callback) override;
+  void StartAssociating(const StartCallback& start_callback) override;
+  void Stop() override;
+  syncer::ModelType type() const override;
+  syncer::ModelSafeGroup model_safe_group() const override;
+  ChangeProcessor* GetChangeProcessor() const override;
+  std::string name() const override;
+  State state() const override;
 
   // DataTypeErrorHandler interface.
-  virtual void OnSingleDatatypeUnrecoverableError(
-      const tracked_objects::Location& from_here,
-      const std::string& message) OVERRIDE;
+  void OnSingleDataTypeUnrecoverableError(
+      const syncer::SyncError& error) override;
 
   // Used by tests to override the factory used to create
   // GenericChangeProcessors.
@@ -63,7 +60,7 @@ class UIDataTypeController : public DataTypeController {
   // For testing only.
   UIDataTypeController();
   // DataTypeController is RefCounted.
-  virtual ~UIDataTypeController();
+  ~UIDataTypeController() override;
 
   // Start any dependent services that need to be running before we can
   // associate models. The default implementation is a no-op.
@@ -78,17 +75,17 @@ class UIDataTypeController : public DataTypeController {
   virtual void StopModels();
 
   // DataTypeController interface.
-  virtual void OnModelLoaded() OVERRIDE;
+  void OnModelLoaded() override;
 
   // Helper method for cleaning up state and invoking the start callback.
-  virtual void StartDone(StartResult result,
+  virtual void StartDone(ConfigureResult result,
                          const syncer::SyncMergeResult& local_merge_result,
                          const syncer::SyncMergeResult& syncer_merge_result);
 
   // Record association time.
   virtual void RecordAssociationTime(base::TimeDelta time);
   // Record causes of start failure.
-  virtual void RecordStartFailure(StartResult result);
+  virtual void RecordStartFailure(ConfigureResult result);
 
   SyncApiComponentFactory* const sync_factory_;
 
@@ -133,6 +130,6 @@ class UIDataTypeController : public DataTypeController {
   DISALLOW_COPY_AND_ASSIGN(UIDataTypeController);
 };
 
-}  // namespace browser_sync
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_UI_DATA_TYPE_CONTROLLER_H_