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

Unified Diff: chrome/browser/sync/profile_sync_service.h

Issue 2002012: sync: Add location info to unrecoverable error. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Add error handler back to bookmark model associator Created 10 years, 6 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/profile_sync_factory_impl.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service.h
===================================================================
--- chrome/browser/sync/profile_sync_service.h (revision 48898)
+++ chrome/browser/sync/profile_sync_service.h (working copy)
@@ -205,6 +205,13 @@
bool unrecoverable_error_detected() const {
return unrecoverable_error_detected_;
}
+ const std::string& unrecoverable_error_message() {
+ return unrecoverable_error_message_;
+ }
+ tracked_objects::Location unrecoverable_error_location() {
+ return unrecoverable_error_location_.get() ?
+ *unrecoverable_error_location_.get() : tracked_objects::Location();
+ }
bool UIShouldDepictAuthInProgress() const {
return is_auth_in_progress_;
@@ -246,7 +253,9 @@
static bool IsSyncEnabled();
// UnrecoverableErrorHandler implementation.
- virtual void OnUnrecoverableError();
+ virtual void OnUnrecoverableError(
+ const tracked_objects::Location& from_here,
+ const std::string& message);
browser_sync::SyncBackendHost* backend() { return backend_.get(); }
@@ -406,6 +415,10 @@
// doing any work that might corrupt things further.
bool unrecoverable_error_detected_;
+ // A message sent when an unrecoverable error occurred.
+ std::string unrecoverable_error_message_;
+ scoped_ptr<tracked_objects::Location> unrecoverable_error_location_;
+
// Which peer-to-peer notification method to use.
browser_sync::NotificationMethod notification_method_;
« no previous file with comments | « chrome/browser/sync/profile_sync_factory_impl.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698