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

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

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.cc
===================================================================
--- trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.cc (revision 289114)
+++ trunk/src/chrome/browser/sync/glue/non_frontend_data_type_controller.cc (working copy)
@@ -340,7 +340,7 @@
}
void NonFrontendDataTypeController::StartDone(
- DataTypeController::ConfigureResult start_result,
+ DataTypeController::StartResult start_result,
const syncer::SyncMergeResult& local_merge_result,
const syncer::SyncMergeResult& syncer_merge_result) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -359,7 +359,7 @@
}
void NonFrontendDataTypeController::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) {
@@ -398,7 +398,7 @@
#undef PER_DATA_TYPE_MACRO
}
-void NonFrontendDataTypeController::RecordStartFailure(ConfigureResult result) {
+void NonFrontendDataTypeController::RecordStartFailure(StartResult result) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
UMA_HISTOGRAM_ENUMERATION("Sync.DataTypeStartFailures",
ModelTypeToHistogramInt(type()),

Powered by Google App Engine
This is Rietveld 408576698