| Index: chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h
|
| diff --git a/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h b/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h
|
| index cded4c3369f539c26e73c39e0d7be958a2f6acf0..b9dedf2b9da028ef2b4a424fbd5ce41622452132 100644
|
| --- a/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h
|
| +++ b/chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h
|
| @@ -33,7 +33,7 @@ class MergeSessionXHRRequestWaiter : public OAuth2LoginManager::Observer {
|
| // OAuth2LoginManager::Observer overrides.
|
| virtual void OnSessionRestoreStateChanged(
|
| Profile* user_profile,
|
| - OAuth2LoginManager::SessionRestoreState state) OVERRIDE;
|
| + OAuth2LoginManager::SessionRestoreState state) override;
|
|
|
| // Timeout callback.
|
| void OnTimeout();
|
|
|