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

Unified Diff: chrome/browser/sync/profile_sync_components_factory_impl.cc

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comments Created 8 years, 6 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: chrome/browser/sync/profile_sync_components_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index bead7fc22bdfa60b61a2ab01427538cacf3535bb..930bf0d36e62b95cd54e54eccfae7f952322a213 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -209,7 +209,7 @@ browser_sync::GenericChangeProcessor*
ProfileSyncComponentsFactoryImpl::CreateGenericChangeProcessor(
ProfileSyncService* profile_sync_service,
browser_sync::DataTypeErrorHandler* error_handler,
- const base::WeakPtr<SyncableService>& local_service) {
+ const base::WeakPtr<csync::SyncableService>& local_service) {
csync::UserShare* user_share = profile_sync_service->GetUserShare();
return new GenericChangeProcessor(error_handler,
local_service,
@@ -221,10 +221,10 @@ browser_sync::SharedChangeProcessor* ProfileSyncComponentsFactoryImpl::
return new SharedChangeProcessor();
}
-base::WeakPtr<SyncableService> ProfileSyncComponentsFactoryImpl::
+base::WeakPtr<csync::SyncableService> ProfileSyncComponentsFactoryImpl::
GetSyncableServiceForType(syncable::ModelType type) {
if (!profile_) { // For tests.
- return base::WeakPtr<SyncableService>();
+ return base::WeakPtr<csync::SyncableService>();
}
switch (type) {
case syncable::PREFERENCES:
@@ -232,7 +232,7 @@ base::WeakPtr<SyncableService> ProfileSyncComponentsFactoryImpl::
case syncable::AUTOFILL:
case syncable::AUTOFILL_PROFILE: {
if (!web_data_service_.get())
- return base::WeakPtr<SyncableService>();
+ return base::WeakPtr<csync::SyncableService>();
if (type == syncable::AUTOFILL) {
return web_data_service_->GetAutocompleteSyncableService()->AsWeakPtr();
} else {
@@ -254,14 +254,14 @@ base::WeakPtr<SyncableService> ProfileSyncComponentsFactoryImpl::
app_notification_manager()->AsWeakPtr();
default:
// The following datatypes still need to be transitioned to the
- // SyncableService API:
+ // csync::SyncableService API:
// Bookmarks
// Passwords
// Sessions
// Themes
// Typed URLs
NOTREACHED();
- return base::WeakPtr<SyncableService>();
+ return base::WeakPtr<csync::SyncableService>();
}
}
« no previous file with comments | « chrome/browser/sync/profile_sync_components_factory_impl.h ('k') | chrome/browser/sync/profile_sync_components_factory_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698