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

Unified Diff: components/sync_bookmarks/bookmark_data_type_controller.cc

Issue 2388673002: Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co (Closed)
Patch Set: 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_bookmarks/bookmark_data_type_controller.cc
diff --git a/components/sync_bookmarks/bookmark_data_type_controller.cc b/components/sync_bookmarks/bookmark_data_type_controller.cc
index 1a2e494eb6b6ddc7b9b435e98947c2dff4fc9aaa..5d906d394df8dfdff28d33498f4bd3c94df56aaf 100644
--- a/components/sync_bookmarks/bookmark_data_type_controller.cc
+++ b/components/sync_bookmarks/bookmark_data_type_controller.cc
@@ -16,10 +16,8 @@ namespace sync_bookmarks {
BookmarkDataTypeController::BookmarkDataTypeController(
const base::Closure& dump_stack,
- syncer::SyncClient* sync_client)
- : syncer::FrontendDataTypeController(syncer::BOOKMARKS,
- dump_stack,
- sync_client),
+ sync_driver::SyncClient* sync_client)
+ : FrontendDataTypeController(syncer::BOOKMARKS, dump_stack, sync_client),
history_service_observer_(this),
bookmark_model_observer_(this) {}
@@ -46,7 +44,7 @@ void BookmarkDataTypeController::CleanUpState() {
void BookmarkDataTypeController::CreateSyncComponents() {
DCHECK(CalledOnValidThread());
- syncer::SyncApiComponentFactory::SyncComponents sync_components =
+ sync_driver::SyncApiComponentFactory::SyncComponents sync_components =
sync_client_->GetSyncApiComponentFactory()->CreateBookmarkSyncComponents(
sync_client_->GetSyncService(), CreateErrorHandler());
set_model_associator(sync_components.model_associator);

Powered by Google App Engine
This is Rietveld 408576698