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

Unified Diff: chrome/browser/sync/glue/bookmark_model_associator.h

Issue 7453014: [Sync] Refactor sync datatype error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix final unit test <3 c++ 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/bookmark_model_associator.h
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h
index ac0da1c5409fab0702a13ee872c0e4a90de2ead5..27471c2b0e37786319008c05ffb74438a147f44d 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.h
+++ b/chrome/browser/sync/glue/bookmark_model_associator.h
@@ -52,9 +52,9 @@ class BookmarkModelAssociator
// node. After successful completion, the models should be identical and
// corresponding. Returns true on success. On failure of this step, we
// should abort the sync operation and report an error to the user.
- virtual bool AssociateModels();
+ virtual bool AssociateModels(SyncError* error);
- virtual bool DisassociateModels();
+ virtual bool DisassociateModels(SyncError* error);
// The has_nodes out param is true if the sync model has nodes other
// than the permanent tagged nodes.
@@ -111,7 +111,7 @@ class BookmarkModelAssociator
// Matches up the bookmark model and the sync model to build model
// associations.
- bool BuildAssociations();
+ bool BuildAssociations(SyncError* error);
// Associate a top-level node of the bookmark model with a permanent node in
// the sync domain. Such permanent nodes are identified by a tag that is

Powered by Google App Engine
This is Rietveld 408576698