OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/profile_menu_controller.h" | 5 #import "chrome/browser/ui/cocoa/profile_menu_controller.h" |
6 | 6 |
7 #include "base/sys_string_conversions.h" | 7 #include "base/sys_string_conversions.h" |
8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
9 #include "chrome/browser/profiles/avatar_menu_model.h" | 9 #include "chrome/browser/profiles/avatar_menu_model.h" |
10 #include "chrome/browser/profiles/avatar_menu_model_observer.h" | 10 #include "chrome/browser/profiles/avatar_menu_model_observer.h" |
(...skipping 17 matching lines...) Expand all Loading... | |
28 | 28 |
29 namespace ProfileMenuControllerInternal { | 29 namespace ProfileMenuControllerInternal { |
30 | 30 |
31 class Observer : public chrome::BrowserListObserver, | 31 class Observer : public chrome::BrowserListObserver, |
32 public AvatarMenuModelObserver { | 32 public AvatarMenuModelObserver { |
33 public: | 33 public: |
34 Observer(ProfileMenuController* controller) : controller_(controller) { | 34 Observer(ProfileMenuController* controller) : controller_(controller) { |
35 BrowserList::AddObserver(this); | 35 BrowserList::AddObserver(this); |
36 } | 36 } |
37 | 37 |
38 ~Observer() { | 38 virtual ~Observer() { |
39 BrowserList::RemoveObserver(this); | 39 BrowserList::RemoveObserver(this); |
40 } | 40 } |
41 | 41 |
42 // chrome::BrowserListObserver: | 42 // chrome::BrowserListObserver: |
43 virtual void OnBrowserAdded(Browser* browser) {} | 43 virtual void OnBrowserAdded(Browser* browser) OVERRIDE {} |
Nico
2013/02/18 10:43:36
Once OVERRIDE is mandatory, maybe we can drop the
| |
44 virtual void OnBrowserRemoved(Browser* browser) { | 44 virtual void OnBrowserRemoved(Browser* browser) OVERRIDE { |
45 [controller_ activeBrowserChangedTo:chrome::GetLastActiveBrowser()]; | 45 [controller_ activeBrowserChangedTo:chrome::GetLastActiveBrowser()]; |
46 } | 46 } |
47 virtual void OnBrowserSetLastActive(Browser* browser) { | 47 virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE { |
48 [controller_ activeBrowserChangedTo:browser]; | 48 [controller_ activeBrowserChangedTo:browser]; |
49 } | 49 } |
50 | 50 |
51 // AvatarMenuModelObserver: | 51 // AvatarMenuModelObserver: |
52 virtual void OnAvatarMenuModelChanged(AvatarMenuModel* model) { | 52 virtual void OnAvatarMenuModelChanged(AvatarMenuModel* model) OVERRIDE { |
53 [controller_ rebuildMenu]; | 53 [controller_ rebuildMenu]; |
54 } | 54 } |
55 | 55 |
56 private: | 56 private: |
57 ProfileMenuController* controller_; // Weak; owns this. | 57 ProfileMenuController* controller_; // Weak; owns this. |
58 }; | 58 }; |
59 | 59 |
60 } // namespace ProfileMenuControllerInternal | 60 } // namespace ProfileMenuControllerInternal |
61 | 61 |
62 //////////////////////////////////////////////////////////////////////////////// | 62 //////////////////////////////////////////////////////////////////////////////// |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
214 } | 214 } |
215 | 215 |
216 - (NSMenuItem*)createItemWithTitle:(NSString*)title action:(SEL)sel { | 216 - (NSMenuItem*)createItemWithTitle:(NSString*)title action:(SEL)sel { |
217 scoped_nsobject<NSMenuItem> item( | 217 scoped_nsobject<NSMenuItem> item( |
218 [[NSMenuItem alloc] initWithTitle:title action:sel keyEquivalent:@""]); | 218 [[NSMenuItem alloc] initWithTitle:title action:sel keyEquivalent:@""]); |
219 [item setTarget:self]; | 219 [item setTarget:self]; |
220 return [item.release() autorelease]; | 220 return [item.release() autorelease]; |
221 } | 221 } |
222 | 222 |
223 @end | 223 @end |
OLD | NEW |