| Index: chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
|
| index 5c432b2803a13606e4b73ce462313525d41db08a..0482cbc6b975c0c84aea88c212c23b83a6dafbda 100644
|
| --- a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
|
| @@ -64,7 +64,7 @@ class ProfileInfoUpdateObserver : public ProfileInfoCacheObserver,
|
| errorController->AddObserver(this);
|
| }
|
|
|
| - virtual ~ProfileInfoUpdateObserver() {
|
| + ~ProfileInfoUpdateObserver() override {
|
| g_browser_process->profile_manager()->
|
| GetProfileInfoCache().RemoveObserver(this);
|
| SigninErrorController* errorController =
|
| @@ -74,40 +74,37 @@ class ProfileInfoUpdateObserver : public ProfileInfoCacheObserver,
|
| }
|
|
|
| // ProfileInfoCacheObserver:
|
| - virtual void OnProfileAdded(const base::FilePath& profile_path) override {
|
| + void OnProfileAdded(const base::FilePath& profile_path) override {
|
| [avatarController_ updateAvatarButtonAndLayoutParent:YES];
|
| }
|
|
|
| - virtual void OnProfileWasRemoved(
|
| - const base::FilePath& profile_path,
|
| - const base::string16& profile_name) override {
|
| + void OnProfileWasRemoved(const base::FilePath& profile_path,
|
| + const base::string16& profile_name) override {
|
| // If deleting the active profile, don't bother updating the avatar
|
| // button, as the browser window is being closed anyway.
|
| if (profile_->GetPath() != profile_path)
|
| [avatarController_ updateAvatarButtonAndLayoutParent:YES];
|
| }
|
|
|
| - virtual void OnProfileNameChanged(
|
| - const base::FilePath& profile_path,
|
| - const base::string16& old_profile_name) override {
|
| + void OnProfileNameChanged(const base::FilePath& profile_path,
|
| + const base::string16& old_profile_name) override {
|
| if (profile_->GetPath() == profile_path)
|
| [avatarController_ updateAvatarButtonAndLayoutParent:YES];
|
| }
|
|
|
| - virtual void OnProfileAvatarChanged(
|
| - const base::FilePath& profile_path) override {
|
| + void OnProfileAvatarChanged(const base::FilePath& profile_path) override {
|
| if (profile_->GetPath() == profile_path)
|
| [avatarController_ updateAvatarButtonAndLayoutParent:YES];
|
| }
|
|
|
| - virtual void OnProfileSupervisedUserIdChanged(
|
| + void OnProfileSupervisedUserIdChanged(
|
| const base::FilePath& profile_path) override {
|
| if (profile_->GetPath() == profile_path)
|
| [avatarController_ updateAvatarButtonAndLayoutParent:YES];
|
| }
|
|
|
| // SigninErrorController::Observer:
|
| - virtual void OnErrorChanged() override {
|
| + void OnErrorChanged() override {
|
| SigninErrorController* errorController =
|
| profiles::GetSigninErrorController(profile_);
|
| if (errorController)
|
|
|