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

Unified Diff: components/browser_sync/browser/profile_sync_service.cc

Issue 2343463003: [Sync] Fix namespaces for the sync_sessions component. (Closed)
Patch Set: Fix gn. 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
« no previous file with comments | « components/browser_sync/browser/profile_sync_service.h ('k') | components/sync/driver/fake_sync_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/browser_sync/browser/profile_sync_service.cc
diff --git a/components/browser_sync/browser/profile_sync_service.cc b/components/browser_sync/browser/profile_sync_service.cc
index d5a24883feefa098b9e2ef02401ded594c9a8753..48d01e49922b4c5f96bb97d722406b96fce031e4 100644
--- a/components/browser_sync/browser/profile_sync_service.cc
+++ b/components/browser_sync/browser/profile_sync_service.cc
@@ -100,7 +100,6 @@
#include "components/sync/core/read_transaction.h"
#endif
-using browser_sync::SessionsSyncManager;
using browser_sync::SyncBackendHost;
using sync_driver::ChangeProcessor;
using sync_driver::DataTypeController;
@@ -108,6 +107,7 @@ using sync_driver::DataTypeManager;
using sync_driver::DataTypeStatusTable;
using sync_driver::DeviceInfoSyncService;
using sync_driver_v2::DeviceInfoService;
+using sync_sessions::SessionsSyncManager;
using syncer::ModelType;
using syncer::ModelTypeSet;
using syncer::JsBackend;
@@ -277,7 +277,7 @@ void ProfileSyncService::Initialize() {
base::Bind(&ProfileSyncService::CanBackendStart, base::Unretained(this)),
base::Bind(&ProfileSyncService::StartUpSlowBackendComponents,
weak_factory_.GetWeakPtr())));
- std::unique_ptr<browser_sync::LocalSessionEventRouter> router(
+ std::unique_ptr<sync_sessions::LocalSessionEventRouter> router(
sync_client_->GetSyncSessionsClient()->GetLocalSessionEventRouter());
local_device_ = sync_client_->GetSyncApiComponentFactory()
->CreateLocalDeviceInfoProvider();
@@ -440,13 +440,13 @@ bool ProfileSyncService::IsDataTypeControllerRunning(
return iter->second->state() == DataTypeController::RUNNING;
}
-sync_driver::OpenTabsUIDelegate* ProfileSyncService::GetOpenTabsUIDelegate() {
+sync_sessions::OpenTabsUIDelegate* ProfileSyncService::GetOpenTabsUIDelegate() {
if (!IsDataTypeControllerRunning(syncer::SESSIONS))
return NULL;
return sessions_sync_manager_.get();
}
-browser_sync::FaviconCache* ProfileSyncService::GetFaviconCache() {
+sync_sessions::FaviconCache* ProfileSyncService::GetFaviconCache() {
return sessions_sync_manager_->GetFaviconCache();
}
@@ -481,7 +481,7 @@ void ProfileSyncService::OnSessionRestoreComplete() {
}
DCHECK(iter->second);
- static_cast<browser_sync::SessionDataTypeController*>(iter->second.get())
+ static_cast<sync_sessions::SessionDataTypeController*>(iter->second.get())
->OnSessionRestoreComplete();
}
« no previous file with comments | « components/browser_sync/browser/profile_sync_service.h ('k') | components/sync/driver/fake_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698