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

Unified Diff: chrome/browser/sync/glue/syncable_service_adapter.cc

Issue 8274020: Revert 105404 - [Sync] Refactor non-frontend DTC to handle new API properly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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
« no previous file with comments | « chrome/browser/sync/glue/shared_change_processor_ref.cc ('k') | chrome/browser/sync/profile_sync_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/syncable_service_adapter.cc
===================================================================
--- chrome/browser/sync/glue/syncable_service_adapter.cc (revision 105407)
+++ chrome/browser/sync/glue/syncable_service_adapter.cc (working copy)
@@ -39,10 +39,6 @@
*error = temp_error;
return false;
}
-
- // TODO(zea): Have all datatypes take ownership of the sync_processor_.
- // Further, refactor the DTC's to not need this class at all
- // (crbug.com/100114).
temp_error = service_->MergeDataAndStartSyncing(type_,
initial_sync_data,
sync_processor_);
@@ -64,7 +60,8 @@
}
void SyncableServiceAdapter::AbortAssociation() {
- NOTIMPLEMENTED();
+ service_->StopSyncing(type_);
+ syncing_ = false;
}
bool SyncableServiceAdapter::CryptoReadyIfNecessary() {
« no previous file with comments | « chrome/browser/sync/glue/shared_change_processor_ref.cc ('k') | chrome/browser/sync/profile_sync_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698