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

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

Issue 7497014: Revert 94128 - [Sync] Refactor sync datatype error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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/glue/syncable_service_adapter.cc
===================================================================
--- chrome/browser/sync/glue/syncable_service_adapter.cc (revision 94142)
+++ chrome/browser/sync/glue/syncable_service_adapter.cc (working copy)
@@ -30,26 +30,18 @@
}
}
-bool SyncableServiceAdapter::AssociateModels(SyncError* error) {
+bool SyncableServiceAdapter::AssociateModels() {
syncing_ = true;
SyncDataList initial_sync_data;
- SyncError temp_error =
- sync_processor_->GetSyncDataForType(type_, &initial_sync_data);
- if (temp_error.IsSet()) {
- *error = temp_error;
+ if (!sync_processor_->GetSyncDataForType(type_, &initial_sync_data)) {
return false;
}
- temp_error = service_->MergeDataAndStartSyncing(type_,
- initial_sync_data,
- sync_processor_);
- if (temp_error.IsSet()) {
- *error = temp_error;
- return false;
- }
- return true;
+ return service_->MergeDataAndStartSyncing(type_,
+ initial_sync_data,
+ sync_processor_);
}
-bool SyncableServiceAdapter::DisassociateModels(SyncError* error) {
+bool SyncableServiceAdapter::DisassociateModels() {
service_->StopSyncing(type_);
syncing_ = false;
return true;
« no previous file with comments | « chrome/browser/sync/glue/syncable_service_adapter.h ('k') | chrome/browser/sync/glue/theme_data_type_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698