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

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

Issue 1407103008: mac: Stop using __weak. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: no ifdef Created 5 years, 1 month 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 #ifndef CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_MENU_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_MENU_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_MENU_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_MENU_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 11 matching lines...) Expand all
22 @interface ProfileMenuController : NSObject { 22 @interface ProfileMenuController : NSObject {
23 @private 23 @private
24 // The controller for the profile submenu. 24 // The controller for the profile submenu.
25 scoped_ptr<AvatarMenu> avatarMenu_; 25 scoped_ptr<AvatarMenu> avatarMenu_;
26 26
27 // An observer to be notified when the active browser changes and when the 27 // An observer to be notified when the active browser changes and when the
28 // menu model changes. 28 // menu model changes.
29 scoped_ptr<ProfileMenuControllerInternal::Observer> observer_; 29 scoped_ptr<ProfileMenuControllerInternal::Observer> observer_;
30 30
31 // The main menu item to which the profile menu is attached. 31 // The main menu item to which the profile menu is attached.
32 __weak NSMenuItem* mainMenuItem_; 32 NSMenuItem* mainMenuItem_; // weak
33 } 33 }
34 34
35 // Designated initializer. 35 // Designated initializer.
36 - (id)initWithMainMenuItem:(NSMenuItem*)item; 36 - (id)initWithMainMenuItem:(NSMenuItem*)item;
37 37
38 // Actions for the menu items. 38 // Actions for the menu items.
39 - (IBAction)switchToProfileFromMenu:(id)sender; 39 - (IBAction)switchToProfileFromMenu:(id)sender;
40 - (IBAction)switchToProfileFromDock:(id)sender; 40 - (IBAction)switchToProfileFromDock:(id)sender;
41 - (IBAction)editProfile:(id)sender; 41 - (IBAction)editProfile:(id)sender;
42 - (IBAction)newProfile:(id)sender; 42 - (IBAction)newProfile:(id)sender;
43 43
44 // If profiles are enabled and there is more than one profile, this inserts 44 // If profiles are enabled and there is more than one profile, this inserts
45 // profile menu items into the specified menu at the specified offset and 45 // profile menu items into the specified menu at the specified offset and
46 // returns YES. Otherwise, this returns NO and does not modify the menu. 46 // returns YES. Otherwise, this returns NO and does not modify the menu.
47 - (BOOL)insertItemsIntoMenu:(NSMenu*)menu 47 - (BOOL)insertItemsIntoMenu:(NSMenu*)menu
48 atOffset:(NSInteger)offset 48 atOffset:(NSInteger)offset
49 fromDock:(BOOL)dock; 49 fromDock:(BOOL)dock;
50 50
51 @end 51 @end
52 52
53 @interface ProfileMenuController (PrivateExposedForTesting) 53 @interface ProfileMenuController (PrivateExposedForTesting)
54 - (NSMenu*)menu; 54 - (NSMenu*)menu;
55 - (void)rebuildMenu; 55 - (void)rebuildMenu;
56 - (NSMenuItem*)createItemWithTitle:(NSString*)title action:(SEL)sel; 56 - (NSMenuItem*)createItemWithTitle:(NSString*)title action:(SEL)sel;
57 - (void)activeBrowserChangedTo:(Browser*)browser; 57 - (void)activeBrowserChangedTo:(Browser*)browser;
58 @end 58 @end
59 59
60 #endif // CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_MENU_CONTROLLER_H_ 60 #endif // CHROME_BROWSER_UI_COCOA_PROFILES_PROFILE_MENU_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698