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 #ifndef CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_CONTROLLER_H_ |
6 #define CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_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 28 matching lines...) Expand all Loading... |
39 | 39 |
40 // The model, rebuilt each time the |-menuNeedsUpdate:|. | 40 // The model, rebuilt each time the |-menuNeedsUpdate:|. |
41 scoped_ptr<WrenchMenuModel> wrenchMenuModel_; | 41 scoped_ptr<WrenchMenuModel> wrenchMenuModel_; |
42 | 42 |
43 // Used to update icons in the recent tabs menu. This must be declared after | 43 // Used to update icons in the recent tabs menu. This must be declared after |
44 // |wrenchMenuModel_| so that it gets deleted first. | 44 // |wrenchMenuModel_| so that it gets deleted first. |
45 scoped_ptr<RecentTabsMenuModelDelegate> recentTabsMenuModelDelegate_; | 45 scoped_ptr<RecentTabsMenuModelDelegate> recentTabsMenuModelDelegate_; |
46 | 46 |
47 // A shim NSViewController that loads the buttons from the NIB because ObjC | 47 // A shim NSViewController that loads the buttons from the NIB because ObjC |
48 // doesn't have multiple inheritance as this class is a MenuController. | 48 // doesn't have multiple inheritance as this class is a MenuController. |
49 scoped_nsobject<WrenchMenuButtonViewController> buttonViewController_; | 49 base::scoped_nsobject<WrenchMenuButtonViewController> buttonViewController_; |
50 | 50 |
51 // The browser for which this controller exists. | 51 // The browser for which this controller exists. |
52 Browser* browser_; // weak | 52 Browser* browser_; // weak |
53 | 53 |
54 // Used to build the bookmark submenu. | 54 // Used to build the bookmark submenu. |
55 scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_; | 55 scoped_ptr<BookmarkMenuBridge> bookmarkMenuBridge_; |
56 | 56 |
57 // Observer for page zoom level change notifications. | 57 // Observer for page zoom level change notifications. |
58 scoped_ptr<WrenchMenuControllerInternal::ZoomLevelObserver> observer_; | 58 scoped_ptr<WrenchMenuControllerInternal::ZoomLevelObserver> observer_; |
59 } | 59 } |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 @property(assign, nonatomic) IBOutlet NSButton* zoomDisplay; | 104 @property(assign, nonatomic) IBOutlet NSButton* zoomDisplay; |
105 @property(assign, nonatomic) IBOutlet NSButton* zoomMinus; | 105 @property(assign, nonatomic) IBOutlet NSButton* zoomMinus; |
106 @property(assign, nonatomic) IBOutlet NSButton* zoomFullScreen; | 106 @property(assign, nonatomic) IBOutlet NSButton* zoomFullScreen; |
107 | 107 |
108 - (id)initWithController:(WrenchMenuController*)controller; | 108 - (id)initWithController:(WrenchMenuController*)controller; |
109 - (IBAction)dispatchWrenchMenuCommand:(id)sender; | 109 - (IBAction)dispatchWrenchMenuCommand:(id)sender; |
110 | 110 |
111 @end | 111 @end |
112 | 112 |
113 #endif // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_CONTROLLER_H_ | 113 #endif // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_CONTROLLER_H_ |
OLD | NEW |