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

Unified Diff: trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.h

Issue 468643002: Revert 288464 "[Sync] Cleanup datatype configuration error handl..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 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: trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.h
===================================================================
--- trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.h (revision 289114)
+++ trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.h (working copy)
@@ -134,13 +134,13 @@
// Start up complete, update the state and invoke the callback.
// Note: this is performed on the datatype's thread.
virtual void StartDone(
- DataTypeController::ConfigureResult start_result,
+ DataTypeController::StartResult start_result,
const syncer::SyncMergeResult& local_merge_result,
const syncer::SyncMergeResult& syncer_merge_result);
// UI thread implementation of StartDone.
virtual void StartDoneImpl(
- DataTypeController::ConfigureResult start_result,
+ DataTypeController::StartResult start_result,
DataTypeController::State new_state,
const syncer::SyncMergeResult& local_merge_result,
const syncer::SyncMergeResult& syncer_merge_result);
@@ -153,7 +153,7 @@
// Record association time. Called on Datatype's thread.
virtual void RecordAssociationTime(base::TimeDelta time);
// Record causes of start failure. Called on UI thread.
- virtual void RecordStartFailure(ConfigureResult result);
+ virtual void RecordStartFailure(StartResult result);
// Handles the reporting of unrecoverable error. It records stuff in
// UMA and reports to breakpad.

Powered by Google App Engine
This is Rietveld 408576698