| Index: chrome/browser/profiles/profile_info_cache.h
|
| diff --git a/chrome/browser/profiles/profile_info_cache.h b/chrome/browser/profiles/profile_info_cache.h
|
| index 1572427ae42dc8f8744f8acaaabd6263f5807b11..ead90eb2aa164dc0270e1379e689b6f63d49abd3 100644
|
| --- a/chrome/browser/profiles/profile_info_cache.h
|
| +++ b/chrome/browser/profiles/profile_info_cache.h
|
| @@ -52,46 +52,46 @@ class ProfileInfoCache : public ProfileInfoInterface,
|
| void DeleteProfileFromCache(const base::FilePath& profile_path);
|
|
|
| // ProfileInfoInterface:
|
| - virtual size_t GetNumberOfProfiles() const OVERRIDE;
|
| + virtual size_t GetNumberOfProfiles() const override;
|
| // Don't cache this value and reuse, because resorting the menu could cause
|
| // the item being referred to to change out from under you.
|
| virtual size_t GetIndexOfProfileWithPath(
|
| - const base::FilePath& profile_path) const OVERRIDE;
|
| - virtual base::string16 GetNameOfProfileAtIndex(size_t index) const OVERRIDE;
|
| + const base::FilePath& profile_path) const override;
|
| + virtual base::string16 GetNameOfProfileAtIndex(size_t index) const override;
|
| virtual base::string16 GetShortcutNameOfProfileAtIndex(size_t index)
|
| - const OVERRIDE;
|
| - virtual base::FilePath GetPathOfProfileAtIndex(size_t index) const OVERRIDE;
|
| - virtual base::Time GetProfileActiveTimeAtIndex(size_t index) const OVERRIDE;
|
| + const override;
|
| + virtual base::FilePath GetPathOfProfileAtIndex(size_t index) const override;
|
| + virtual base::Time GetProfileActiveTimeAtIndex(size_t index) const override;
|
| virtual base::string16 GetUserNameOfProfileAtIndex(
|
| - size_t index) const OVERRIDE;
|
| + size_t index) const override;
|
| virtual const gfx::Image& GetAvatarIconOfProfileAtIndex(
|
| - size_t index) const OVERRIDE;
|
| + size_t index) const override;
|
| virtual std::string GetLocalAuthCredentialsOfProfileAtIndex(
|
| - size_t index) const OVERRIDE;
|
| + size_t index) const override;
|
| // Note that a return value of false could mean an error in collection or
|
| // that there are currently no background apps running. However, the action
|
| // which results is the same in both cases (thus far).
|
| virtual bool GetBackgroundStatusOfProfileAtIndex(
|
| - size_t index) const OVERRIDE;
|
| + size_t index) const override;
|
| virtual base::string16 GetGAIANameOfProfileAtIndex(
|
| - size_t index) const OVERRIDE;
|
| + size_t index) const override;
|
| virtual base::string16 GetGAIAGivenNameOfProfileAtIndex(
|
| - size_t index) const OVERRIDE;
|
| + size_t index) const override;
|
| // Returns the GAIA picture for the given profile. This may return NULL
|
| // if the profile does not have a GAIA picture or if the picture must be
|
| // loaded from disk.
|
| virtual const gfx::Image* GetGAIAPictureOfProfileAtIndex(
|
| - size_t index) const OVERRIDE;
|
| + size_t index) const override;
|
| virtual bool IsUsingGAIAPictureOfProfileAtIndex(
|
| - size_t index) const OVERRIDE;
|
| - virtual bool ProfileIsSupervisedAtIndex(size_t index) const OVERRIDE;
|
| - virtual bool IsOmittedProfileAtIndex(size_t index) const OVERRIDE;
|
| - virtual bool ProfileIsSigninRequiredAtIndex(size_t index) const OVERRIDE;
|
| + size_t index) const override;
|
| + virtual bool ProfileIsSupervisedAtIndex(size_t index) const override;
|
| + virtual bool IsOmittedProfileAtIndex(size_t index) const override;
|
| + virtual bool ProfileIsSigninRequiredAtIndex(size_t index) const override;
|
| virtual std::string GetSupervisedUserIdOfProfileAtIndex(size_t index) const
|
| - OVERRIDE;
|
| - virtual bool ProfileIsEphemeralAtIndex(size_t index) const OVERRIDE;
|
| - virtual bool ProfileIsUsingDefaultNameAtIndex(size_t index) const OVERRIDE;
|
| - virtual bool ProfileIsUsingDefaultAvatarAtIndex(size_t index) const OVERRIDE;
|
| + override;
|
| + virtual bool ProfileIsEphemeralAtIndex(size_t index) const override;
|
| + virtual bool ProfileIsUsingDefaultNameAtIndex(size_t index) const override;
|
| + virtual bool ProfileIsUsingDefaultAvatarAtIndex(size_t index) const override;
|
|
|
| size_t GetAvatarIconIndexOfProfileAtIndex(size_t index) const;
|
|
|
|
|