| Index: chrome/browser/chromeos/login/signin/merge_session_throttle.h
|
| diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttle.h b/chrome/browser/chromeos/login/signin/merge_session_throttle.h
|
| index b07c57ef2a09025ce796e2b34410a105bd1a173a..c0298ad98bcfd6cfb665a4759db40dda5fa2771b 100644
|
| --- a/chrome/browser/chromeos/login/signin/merge_session_throttle.h
|
| +++ b/chrome/browser/chromeos/login/signin/merge_session_throttle.h
|
| @@ -40,8 +40,8 @@ class MergeSessionThrottle
|
| virtual ~MergeSessionThrottle();
|
|
|
| // content::ResourceThrottle implementation:
|
| - virtual void WillStartRequest(bool* defer) OVERRIDE;
|
| - virtual const char* GetNameForLogging() const OVERRIDE;
|
| + virtual void WillStartRequest(bool* defer) override;
|
| + virtual const char* GetNameForLogging() const override;
|
|
|
| // Checks if session is already merged.
|
| static bool AreAllSessionMergedAlready();
|
|
|