| Index: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
|
| index 8b6376f488f0161a0694d7a6014455b128bd5f84..d08dfcfa003007b6956cb89ec96578074cd37fff 100644
|
| --- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
|
| @@ -263,9 +263,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
|
| AddTokenServiceObserver();
|
| }
|
|
|
| - virtual ~ActiveProfileObserverBridge() {
|
| - RemoveTokenServiceObserver();
|
| - }
|
| + ~ActiveProfileObserverBridge() override { RemoveTokenServiceObserver(); }
|
|
|
| private:
|
| void AddTokenServiceObserver() {
|
| @@ -288,7 +286,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
|
| }
|
|
|
| // OAuth2TokenService::Observer:
|
| - virtual void OnRefreshTokenAvailable(const std::string& account_id) override {
|
| + void OnRefreshTokenAvailable(const std::string& account_id) override {
|
| // Tokens can only be added by adding an account through the inline flow,
|
| // which is started from the account management view. Refresh it to show the
|
| // update.
|
| @@ -303,7 +301,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
|
| }
|
| }
|
|
|
| - virtual void OnRefreshTokenRevoked(const std::string& account_id) override {
|
| + void OnRefreshTokenRevoked(const std::string& account_id) override {
|
| // Tokens can only be removed from the account management view. Refresh it
|
| // to show the update.
|
| if ([controller_ viewMode] == profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT)
|
| @@ -312,7 +310,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
|
| }
|
|
|
| // AvatarMenuObserver:
|
| - virtual void OnAvatarMenuChanged(AvatarMenu* avatar_menu) override {
|
| + void OnAvatarMenuChanged(AvatarMenu* avatar_menu) override {
|
| profiles::BubbleViewMode viewMode = [controller_ viewMode];
|
| if (viewMode == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER ||
|
| viewMode == profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT) {
|
| @@ -321,10 +319,9 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
|
| }
|
|
|
| // content::NotificationObserver:
|
| - virtual void Observe(
|
| - int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override {
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override {
|
| DCHECK_EQ(chrome::NOTIFICATION_BROWSER_CLOSING, type);
|
| if (browser_ == content::Source<Browser>(source).ptr()) {
|
| RemoveTokenServiceObserver();
|
|
|