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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/backend_migrator.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
« no previous file with comments | « chrome/browser/sync/api/syncable_service_mock.h ('k') | chrome/browser/sync/backend_migrator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/backend_migrator.cc
===================================================================
--- chrome/browser/sync/backend_migrator.cc (revision 94142)
+++ chrome/browser/sync/backend_migrator.cc (working copy)
@@ -121,8 +121,9 @@
if (state_ == IDLE)
return;
- const DataTypeManager::ConfigureResult* result =
- Details<DataTypeManager::ConfigureResult>(details).ptr();
+ DataTypeManager::ConfigureResultWithErrorLocation* result =
+ Details<DataTypeManager::ConfigureResultWithErrorLocation>(
+ details).ptr();
ModelTypeSet intersection;
std::set_intersection(result->requested_types.begin(),
@@ -150,7 +151,7 @@
return;
}
- if (result->status != DataTypeManager::OK) {
+ if (result->result != 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
« no previous file with comments | « chrome/browser/sync/api/syncable_service_mock.h ('k') | chrome/browser/sync/backend_migrator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698