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

Unified Diff: chrome/browser/sync/backend_migrator.cc

Issue 7453014: [Sync] Refactor sync datatype error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and really really fix compile 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/backend_migrator.cc
diff --git a/chrome/browser/sync/backend_migrator.cc b/chrome/browser/sync/backend_migrator.cc
index 4d8550f2e683dbea30f0f6bf1db15d6be3a87d5e..cc0b613349a28490dd7553b9224028fee2e22e66 100644
--- a/chrome/browser/sync/backend_migrator.cc
+++ b/chrome/browser/sync/backend_migrator.cc
@@ -121,9 +121,8 @@ void BackendMigrator::Observe(int type,
if (state_ == IDLE)
return;
- DataTypeManager::ConfigureResultWithErrorLocation* result =
- Details<DataTypeManager::ConfigureResultWithErrorLocation>(
- details).ptr();
+ const DataTypeManager::ConfigureResult* result =
+ Details<DataTypeManager::ConfigureResult>(details).ptr();
ModelTypeSet intersection;
std::set_intersection(result->requested_types.begin(),
@@ -151,7 +150,7 @@ void BackendMigrator::Observe(int type,
return;
}
- if (result->result != DataTypeManager::OK) {
+ if (result->status != DataTypeManager::OK) {
// If this fails, and we're disabling types, a type may or may not be
// disabled until the user restarts the browser. If this wasn't an abort,
// any failure will be reported as an unrecoverable error to the UI. If it

Powered by Google App Engine
This is Rietveld 408576698