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

Unified Diff: chrome/browser/sync/glue/data_type_manager_impl.h

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/glue/data_type_manager.cc ('k') | chrome/browser/sync/glue/data_type_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/data_type_manager_impl.h
===================================================================
--- chrome/browser/sync/glue/data_type_manager_impl.h (revision 94142)
+++ chrome/browser/sync/glue/data_type_manager_impl.h (working copy)
@@ -50,9 +50,8 @@
// Stops all data types.
void FinishStop();
- void Abort(ConfigureStatus status,
- const tracked_objects::Location& location,
- syncable::ModelType last_attempted_type);
+ void FinishStopAndNotify(ConfigureResult result,
+ const tracked_objects::Location& location);
// Returns true if any last_requested_types_ currently needs to start model
// association. If non-null, fills |needs_start| with all such controllers.
@@ -62,7 +61,8 @@
void Restart(sync_api::ConfigureReason reason, bool enable_nigori);
void DownloadReady(bool success);
void NotifyStart();
- void NotifyDone(const ConfigureResult& result);
+ void NotifyDone(ConfigureResult result,
+ const tracked_objects::Location& location);
void SetBlockedAndNotify();
// Add to |configure_time_delta_| the time since we last called
« no previous file with comments | « chrome/browser/sync/glue/data_type_manager.cc ('k') | chrome/browser/sync/glue/data_type_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698