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

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

Issue 2002012: sync: Add location info to unrecoverable error. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Add error handler back to bookmark model associator Created 10 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/glue/bookmark_model_associator.cc
===================================================================
--- chrome/browser/sync/glue/bookmark_model_associator.cc (revision 48898)
+++ chrome/browser/sync/glue/bookmark_model_associator.cc (working copy)
@@ -155,12 +155,13 @@
BookmarkModelAssociator::BookmarkModelAssociator(
ProfileSyncService* sync_service,
- UnrecoverableErrorHandler* error_handler)
+ UnrecoverableErrorHandler* persist_ids_error_handler)
: sync_service_(sync_service),
- error_handler_(error_handler),
+ persist_ids_error_handler_(persist_ids_error_handler),
ALLOW_THIS_IN_INITIALIZER_LIST(persist_associations_(this)) {
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
DCHECK(sync_service_);
+ DCHECK(persist_ids_error_handler_);
}
BookmarkModelAssociator::~BookmarkModelAssociator() {
@@ -455,7 +456,8 @@
int64 sync_id = *iter;
sync_api::WriteNode sync_node(&trans);
if (!sync_node.InitByIdLookup(sync_id)) {
- error_handler_->OnUnrecoverableError();
+ persist_ids_error_handler_->OnUnrecoverableError(FROM_HERE,
+ "Could not lookup bookmark node for ID persistence.");
return;
}
const BookmarkNode* node = GetChromeNodeFromSyncId(sync_id);
« no previous file with comments | « chrome/browser/sync/glue/bookmark_model_associator.h ('k') | chrome/browser/sync/glue/data_type_controller_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698