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

Unified Diff: chrome/browser/sync/glue/extension_model_associator.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/extension_model_associator.cc
===================================================================
--- chrome/browser/sync/glue/extension_model_associator.cc (revision 94142)
+++ chrome/browser/sync/glue/extension_model_associator.cc (working copy)
@@ -32,24 +32,22 @@
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
}
-bool ExtensionModelAssociator::AssociateModels(SyncError* error) {
+bool ExtensionModelAssociator::AssociateModels() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
ExtensionDataMap extension_data_map;
if (!SlurpExtensionData(
traits_, *extension_service_, user_share_, &extension_data_map)) {
- error->Reset(FROM_HERE, "Failed to get extension data.", model_type());
return false;
}
if (!FlushExtensionData(
traits_, extension_data_map, extension_service_, user_share_)) {
- error->Reset(FROM_HERE, "Failed to flush extension data.", model_type());
return false;
}
return true;
}
-bool ExtensionModelAssociator::DisassociateModels(SyncError* error) {
+bool ExtensionModelAssociator::DisassociateModels() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// Nothing to do.
return true;
« no previous file with comments | « chrome/browser/sync/glue/extension_model_associator.h ('k') | chrome/browser/sync/glue/frontend_data_type_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698