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

Unified Diff: components/sync_sessions/session_data_type_controller.h

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_sessions/session_data_type_controller.h
diff --git a/components/sync_sessions/session_data_type_controller.h b/components/sync_sessions/session_data_type_controller.h
index 44222a2564b5146395885edd45749018c82081ad..a592599b5bb7ba4a500e3ef48d483834bd31e3e4 100644
--- a/components/sync_sessions/session_data_type_controller.h
+++ b/components/sync_sessions/session_data_type_controller.h
@@ -17,12 +17,12 @@ namespace sync_sessions {
// Overrides StartModels to avoid sync contention with sessions during
// a session restore operation at startup and to wait for the local
// device info to become available.
-class SessionDataTypeController : public syncer::UIDataTypeController {
+class SessionDataTypeController : public sync_driver::UIDataTypeController {
public:
// |dump_stack| is called when an unrecoverable error occurs.
SessionDataTypeController(const base::Closure& dump_stack,
- syncer::SyncClient* sync_client,
- syncer::LocalDeviceInfoProvider* local_device,
+ sync_driver::SyncClient* sync_client,
+ sync_driver::LocalDeviceInfoProvider* local_device,
const char* history_disabled_pref_name);
~SessionDataTypeController() override;
@@ -40,10 +40,11 @@ class SessionDataTypeController : public syncer::UIDataTypeController {
void OnLocalDeviceInfoInitialized();
void OnSavingBrowserHistoryPrefChanged();
- syncer::SyncClient* const sync_client_;
+ sync_driver::SyncClient* const sync_client_;
- syncer::LocalDeviceInfoProvider* const local_device_;
- std::unique_ptr<syncer::LocalDeviceInfoProvider::Subscription> subscription_;
+ sync_driver::LocalDeviceInfoProvider* const local_device_;
+ std::unique_ptr<sync_driver::LocalDeviceInfoProvider::Subscription>
+ subscription_;
// Name of the pref that indicates whether saving history is disabled.
const char* history_disabled_pref_name_;
« no previous file with comments | « components/sync_bookmarks/bookmark_model_associator.cc ('k') | components/sync_sessions/session_data_type_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698