| 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/mac/objc_property_releaser.h" |
| 10 #import "base/mac/scoped_nsobject.h" | 11 #import "base/mac/scoped_nsobject.h" |
| 11 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 12 #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h" | 13 #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h" |
| 13 #import "ui/base/cocoa/menu_controller.h" | 14 #import "ui/base/cocoa/menu_controller.h" |
| 14 | 15 |
| 15 class BookmarkMenuBridge; | 16 class BookmarkMenuBridge; |
| 16 class Browser; | 17 class Browser; |
| 17 @class BrowserActionsContainerView; | 18 @class BrowserActionsContainerView; |
| 18 @class BrowserActionsController; | 19 @class BrowserActionsController; |
| 19 @class MenuTrackedRootView; | 20 @class MenuTrackedRootView; |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 NSButton* editPaste_; | 120 NSButton* editPaste_; |
| 120 | 121 |
| 121 MenuTrackedRootView* zoomItem_; | 122 MenuTrackedRootView* zoomItem_; |
| 122 NSButton* zoomPlus_; | 123 NSButton* zoomPlus_; |
| 123 NSButton* zoomDisplay_; | 124 NSButton* zoomDisplay_; |
| 124 NSButton* zoomMinus_; | 125 NSButton* zoomMinus_; |
| 125 NSButton* zoomFullScreen_; | 126 NSButton* zoomFullScreen_; |
| 126 | 127 |
| 127 MenuTrackedRootView* toolbarActionsOverflowItem_; | 128 MenuTrackedRootView* toolbarActionsOverflowItem_; |
| 128 BrowserActionsContainerView* overflowActionsContainerView_; | 129 BrowserActionsContainerView* overflowActionsContainerView_; |
| 130 |
| 131 base::mac::ObjCPropertyReleaser propertyReleaser_; |
| 129 } | 132 } |
| 130 | 133 |
| 131 @property(assign, nonatomic) IBOutlet MenuTrackedRootView* editItem; | 134 @property(retain, nonatomic) IBOutlet MenuTrackedRootView* editItem; |
| 132 @property(assign, nonatomic) IBOutlet NSButton* editCut; | 135 @property(retain, nonatomic) IBOutlet NSButton* editCut; |
| 133 @property(assign, nonatomic) IBOutlet NSButton* editCopy; | 136 @property(retain, nonatomic) IBOutlet NSButton* editCopy; |
| 134 @property(assign, nonatomic) IBOutlet NSButton* editPaste; | 137 @property(retain, nonatomic) IBOutlet NSButton* editPaste; |
| 135 @property(assign, nonatomic) IBOutlet MenuTrackedRootView* zoomItem; | 138 @property(retain, nonatomic) IBOutlet MenuTrackedRootView* zoomItem; |
| 136 @property(assign, nonatomic) IBOutlet NSButton* zoomPlus; | 139 @property(retain, nonatomic) IBOutlet NSButton* zoomPlus; |
| 137 @property(assign, nonatomic) IBOutlet NSButton* zoomDisplay; | 140 @property(retain, nonatomic) IBOutlet NSButton* zoomDisplay; |
| 138 @property(assign, nonatomic) IBOutlet NSButton* zoomMinus; | 141 @property(retain, nonatomic) IBOutlet NSButton* zoomMinus; |
| 139 @property(assign, nonatomic) IBOutlet NSButton* zoomFullScreen; | 142 @property(retain, nonatomic) IBOutlet NSButton* zoomFullScreen; |
| 140 @property(assign, nonatomic) | 143 @property(retain, nonatomic) |
| 141 IBOutlet MenuTrackedRootView* toolbarActionsOverflowItem; | 144 IBOutlet MenuTrackedRootView* toolbarActionsOverflowItem; |
| 142 @property(assign, nonatomic) | 145 @property(retain, nonatomic) |
| 143 IBOutlet BrowserActionsContainerView* overflowActionsContainerView; | 146 IBOutlet BrowserActionsContainerView* overflowActionsContainerView; |
| 144 | 147 |
| 145 - (id)initWithController:(WrenchMenuController*)controller; | 148 - (id)initWithController:(WrenchMenuController*)controller; |
| 146 - (IBAction)dispatchWrenchMenuCommand:(id)sender; | 149 - (IBAction)dispatchWrenchMenuCommand:(id)sender; |
| 147 | 150 |
| 148 @end | 151 @end |
| 149 | 152 |
| 150 #endif // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_CONTROLLER_H_ | 153 #endif // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_CONTROLLER_H_ |
| OLD | NEW |