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

Unified Diff: chrome/browser/sync/engine/model_changing_syncer_command.cc

Issue 8366030: Introduce the plumbing necessary to report Unrecoverable error from model safe workers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: For a high level review. 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/engine/apply_updates_command.cc ('k') | chrome/browser/sync/engine/sync_scheduler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/model_changing_syncer_command.cc
diff --git a/chrome/browser/sync/engine/model_changing_syncer_command.cc b/chrome/browser/sync/engine/model_changing_syncer_command.cc
index 797f795f96bd08580aeb6ac466459e231e7c7763..c431073e7545f9dafb605e51a3920e612f6dc444 100644
--- a/chrome/browser/sync/engine/model_changing_syncer_command.cc
+++ b/chrome/browser/sync/engine/model_changing_syncer_command.cc
@@ -48,6 +48,16 @@ void ModelChangingSyncerCommand::ExecuteImpl(sessions::SyncSession* session) {
scoped_ptr<Callback0::Type> c(NewCallback(this,
&ModelChangingSyncerCommand::StartChangingModel));
worker->DoWorkAndWaitUntilDone(c.get());
+
+ if (session->unrecoverable_error()) {
akalin 2011/10/21 22:18:27 Why not just make the (optional) unrecoverable err
lipalani1 2011/10/21 23:40:03 Agreed On 2011/10/21 22:18:27, akalin wrote:
+ // We are back on the syncer thread. Now use the delegate to send the
+ // error.
+ DCHECK(session->unrecoverable_error_info());
+ session->delegate()->OnUnrecoverableError(
+ session->unrecoverable_error_info()->location,
+ session->unrecoverable_error_info()->message);
+ break;
+ }
}
}
« no previous file with comments | « chrome/browser/sync/engine/apply_updates_command.cc ('k') | chrome/browser/sync/engine/sync_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698