Index: chrome/browser/sync/profile_sync_service.h |
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h |
index 1f45e1fa014020e6688d6e8a5d6b058470813b90..64c692c41da66dd737f2f7f9437af10ccc4279aa 100644 |
--- a/chrome/browser/sync/profile_sync_service.h |
+++ b/chrome/browser/sync/profile_sync_service.h |
@@ -211,7 +211,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend, |
virtual void OnDataTypesChanged( |
const syncable::ModelTypeSet& to_add) OVERRIDE; |
virtual void OnActionableError( |
- const browser_sync::SyncProtocolError& error) OVERRIDE; |
+ const browser_sync::SyncOperationResult& error) OVERRIDE; |
void OnClearServerDataTimeout(); |
@@ -670,7 +670,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend, |
// This is the last |SyncProtocolError| we received from the server that had |
// an action set on it. |
- browser_sync::SyncProtocolError last_actionable_error_; |
+ browser_sync::SyncOperationResult last_actionable_error_; // FIXME: please tell me this isn't used... |
// This is used to show sync errors in the wrench menu. |
scoped_ptr<SyncGlobalError> sync_global_error_; |
@@ -679,7 +679,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend, |
}; |
bool ShouldShowActionOnUI( |
- const browser_sync::SyncProtocolError& error); |
+ const browser_sync::SyncOperationResult& result); |
#endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_ |