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

Unified Diff: components/sync/driver/proxy_data_type_controller.h

Issue 2289143003: [Sync] Convert DTCs to be not RefCounted and NonThreadSafe. (Closed)
Patch Set: Rebase. Created 4 years, 3 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: components/sync/driver/proxy_data_type_controller.h
diff --git a/components/sync/driver/proxy_data_type_controller.h b/components/sync/driver/proxy_data_type_controller.h
index 186400bd67be3073931c5d0179f5e26cf74157a8..c0dd574a5b0d5cfea645c6806ae9be2ad750f067 100644
--- a/components/sync/driver/proxy_data_type_controller.h
+++ b/components/sync/driver/proxy_data_type_controller.h
@@ -5,11 +5,10 @@
#ifndef COMPONENTS_SYNC_DRIVER_PROXY_DATA_TYPE_CONTROLLER_H__
#define COMPONENTS_SYNC_DRIVER_PROXY_DATA_TYPE_CONTROLLER_H__
+#include <memory>
#include <string>
-#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/single_thread_task_runner.h"
#include "components/sync/driver/data_type_controller.h"
namespace sync_driver {
@@ -19,9 +18,8 @@ namespace sync_driver {
// service.
class ProxyDataTypeController : public DataTypeController {
public:
- explicit ProxyDataTypeController(
- const scoped_refptr<base::SingleThreadTaskRunner>& ui_thread,
- syncer::ModelType type);
+ explicit ProxyDataTypeController(syncer::ModelType type);
+ ~ProxyDataTypeController() override;
// DataTypeController interface.
bool ShouldLoadModelBeforeConfigure() const override;
@@ -29,27 +27,18 @@ class ProxyDataTypeController : public DataTypeController {
void RegisterWithBackend(BackendDataTypeConfigurer* configurer) override;
void StartAssociating(const StartCallback& start_callback) override;
void Stop() override;
- syncer::ModelType type() const override;
std::string name() const override;
State state() const override;
void ActivateDataType(BackendDataTypeConfigurer* configurer) override;
void DeactivateDataType(BackendDataTypeConfigurer* configurer) override;
void GetAllNodes(const AllNodesCallback& callback) override;
- // DataTypeErrorHandler interface.
- void OnSingleDataTypeUnrecoverableError(
- const syncer::SyncError& error) override;
-
protected:
- // DataTypeController is RefCounted.
- ~ProxyDataTypeController() override;
+ std::unique_ptr<syncer::DataTypeErrorHandler> CreateErrorHandler() override;
private:
State state_;
- // The actual type for this controller.
- syncer::ModelType type_;
-
DISALLOW_COPY_AND_ASSIGN(ProxyDataTypeController);
};
« no previous file with comments | « components/sync/driver/non_ui_model_type_controller_unittest.cc ('k') | components/sync/driver/proxy_data_type_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698