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

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

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 years, 2 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/non_ui_data_type_controller.h
diff --git a/components/sync/driver/non_ui_data_type_controller.h b/components/sync/driver/non_ui_data_type_controller.h
index 80d859ca45bb1a34eba9bad410809433384ec480..79947d40f5cac39a0554accddea7a2783bf1ccf5 100644
--- a/components/sync/driver/non_ui_data_type_controller.h
+++ b/components/sync/driver/non_ui_data_type_controller.h
@@ -15,18 +15,15 @@
#include "components/sync/driver/shared_change_processor.h"
namespace syncer {
-class SyncableService;
-struct UserShare;
-}
-
-namespace sync_driver {
class SyncClient;
+class SyncableService;
+struct UserShare;
class NonUIDataTypeController : public DirectoryDataTypeController {
public:
// |dump_stack| is called when an unrecoverable error occurs.
- NonUIDataTypeController(syncer::ModelType type,
+ NonUIDataTypeController(ModelType type,
const base::Closure& dump_stack,
SyncClient* sync_client);
~NonUIDataTypeController() override;
@@ -35,7 +32,7 @@ class NonUIDataTypeController : public DirectoryDataTypeController {
void LoadModels(const ModelLoadCallback& model_load_callback) override;
void StartAssociating(const StartCallback& start_callback) override;
void Stop() override;
- syncer::ModelSafeGroup model_safe_group() const override = 0;
+ ModelSafeGroup model_safe_group() const override = 0;
ChangeProcessor* GetChangeProcessor() const override;
std::string name() const override;
State state() const override;
@@ -67,8 +64,8 @@ class NonUIDataTypeController : public DirectoryDataTypeController {
// Start up complete, update the state and invoke the callback.
virtual void StartDone(DataTypeController::ConfigureResult start_result,
- const syncer::SyncMergeResult& local_merge_result,
- const syncer::SyncMergeResult& syncer_merge_result);
+ const SyncMergeResult& local_merge_result,
+ const SyncMergeResult& syncer_merge_result);
// Kick off the association process.
virtual bool StartAssociationAsync();
@@ -85,7 +82,7 @@ class NonUIDataTypeController : public DirectoryDataTypeController {
// us know that it is safe to start associating.
void OnModelLoaded();
- std::unique_ptr<syncer::DataTypeErrorHandler> CreateErrorHandler() override;
+ std::unique_ptr<DataTypeErrorHandler> CreateErrorHandler() override;
private:
// Posted on the backend thread by StartAssociationAsync().
@@ -104,11 +101,11 @@ class NonUIDataTypeController : public DirectoryDataTypeController {
// Disable this type with the sync service. Should only be invoked in case of
// an unrecoverable error.
// Note: this is performed on the UI thread.
- void DisableImpl(const syncer::SyncError& error);
+ void DisableImpl(const SyncError& error);
// UserShare is stored in StartAssociating while on UI thread and
// passed to SharedChangeProcessor::Connect on the model thread.
- syncer::UserShare* user_share_;
+ UserShare* user_share_;
// State of this datatype controller.
State state_;
@@ -133,6 +130,6 @@ class NonUIDataTypeController : public DirectoryDataTypeController {
scoped_refptr<SharedChangeProcessor> shared_change_processor_;
};
-} // namespace sync_driver
+} // namespace syncer
#endif // COMPONENTS_SYNC_DRIVER_NON_UI_DATA_TYPE_CONTROLLER_H_

Powered by Google App Engine
This is Rietveld 408576698