| 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_;
 | 
|  
 | 
| 
 |