Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Side by Side Diff: chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/profiles/profile_menu_controller.h" 5 #import "chrome/browser/ui/cocoa/profiles/profile_menu_controller.h"
6 6
7 #include "base/mac/scoped_nsobject.h" 7 #include "base/mac/scoped_nsobject.h"
8 #include "base/strings/sys_string_conversions.h" 8 #include "base/strings/sys_string_conversions.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/profiles/avatar_menu.h" 10 #include "chrome/browser/profiles/avatar_menu.h"
(...skipping 19 matching lines...) Expand all
30 30
31 namespace ProfileMenuControllerInternal { 31 namespace ProfileMenuControllerInternal {
32 32
33 class Observer : public chrome::BrowserListObserver, 33 class Observer : public chrome::BrowserListObserver,
34 public AvatarMenuObserver { 34 public AvatarMenuObserver {
35 public: 35 public:
36 Observer(ProfileMenuController* controller) : controller_(controller) { 36 Observer(ProfileMenuController* controller) : controller_(controller) {
37 BrowserList::AddObserver(this); 37 BrowserList::AddObserver(this);
38 } 38 }
39 39
40 virtual ~Observer() { 40 ~Observer() override { BrowserList::RemoveObserver(this); }
41 BrowserList::RemoveObserver(this);
42 }
43 41
44 // chrome::BrowserListObserver: 42 // chrome::BrowserListObserver:
45 virtual void OnBrowserAdded(Browser* browser) override {} 43 void OnBrowserAdded(Browser* browser) override {}
46 virtual void OnBrowserRemoved(Browser* browser) override { 44 void OnBrowserRemoved(Browser* browser) override {
47 [controller_ activeBrowserChangedTo:chrome::GetLastActiveBrowser()]; 45 [controller_ activeBrowserChangedTo:chrome::GetLastActiveBrowser()];
48 } 46 }
49 virtual void OnBrowserSetLastActive(Browser* browser) override { 47 void OnBrowserSetLastActive(Browser* browser) override {
50 [controller_ activeBrowserChangedTo:browser]; 48 [controller_ activeBrowserChangedTo:browser];
51 } 49 }
52 50
53 // AvatarMenuObserver: 51 // AvatarMenuObserver:
54 virtual void OnAvatarMenuChanged(AvatarMenu* menu) override { 52 void OnAvatarMenuChanged(AvatarMenu* menu) override {
55 [controller_ rebuildMenu]; 53 [controller_ rebuildMenu];
56 } 54 }
57 55
58 private: 56 private:
59 ProfileMenuController* controller_; // Weak; owns this. 57 ProfileMenuController* controller_; // Weak; owns this.
60 }; 58 };
61 59
62 } // namespace ProfileMenuControllerInternal 60 } // namespace ProfileMenuControllerInternal
63 61
64 //////////////////////////////////////////////////////////////////////////////// 62 ////////////////////////////////////////////////////////////////////////////////
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 } 250 }
253 251
254 - (NSMenuItem*)createItemWithTitle:(NSString*)title action:(SEL)sel { 252 - (NSMenuItem*)createItemWithTitle:(NSString*)title action:(SEL)sel {
255 base::scoped_nsobject<NSMenuItem> item( 253 base::scoped_nsobject<NSMenuItem> item(
256 [[NSMenuItem alloc] initWithTitle:title action:sel keyEquivalent:@""]); 254 [[NSMenuItem alloc] initWithTitle:title action:sel keyEquivalent:@""]);
257 [item setTarget:self]; 255 [item setTarget:self];
258 return [item.release() autorelease]; 256 return [item.release() autorelease];
259 } 257 }
260 258
261 @end 259 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698