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

Side by Side Diff: chrome/browser/ui/cocoa/app_menu/app_menu_controller.h

Issue 2881183002: Revert of Replace ObjCPropertyReleaser with ReleaseProperties() project-wide. (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_APP_MENU_APP_MENU_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_APP_MENU_APP_MENU_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_APP_MENU_APP_MENU_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_APP_MENU_APP_MENU_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include <memory> 10 #include <memory>
11 11
12 #include "base/mac/objc_property_releaser.h"
12 #import "base/mac/scoped_nsobject.h" 13 #import "base/mac/scoped_nsobject.h"
13 #include "base/time/time.h" 14 #include "base/time/time.h"
14 #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h" 15 #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h"
15 #import "ui/base/cocoa/menu_controller.h" 16 #import "ui/base/cocoa/menu_controller.h"
16 17
17 class BookmarkMenuBridge; 18 class BookmarkMenuBridge;
18 class Browser; 19 class Browser;
19 @class BrowserActionsContainerView; 20 @class BrowserActionsContainerView;
20 @class BrowserActionsController; 21 @class BrowserActionsController;
21 @class MenuTrackedRootView; 22 @class MenuTrackedRootView;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 NSButton* editPaste_; 125 NSButton* editPaste_;
125 126
126 MenuTrackedRootView* zoomItem_; 127 MenuTrackedRootView* zoomItem_;
127 NSButton* zoomPlus_; 128 NSButton* zoomPlus_;
128 NSButton* zoomDisplay_; 129 NSButton* zoomDisplay_;
129 NSButton* zoomMinus_; 130 NSButton* zoomMinus_;
130 NSButton* zoomFullScreen_; 131 NSButton* zoomFullScreen_;
131 132
132 MenuTrackedRootView* toolbarActionsOverflowItem_; 133 MenuTrackedRootView* toolbarActionsOverflowItem_;
133 BrowserActionsContainerView* overflowActionsContainerView_; 134 BrowserActionsContainerView* overflowActionsContainerView_;
135
136 base::mac::ObjCPropertyReleaser propertyReleaser_;
134 } 137 }
135 138
136 @property(retain, nonatomic) IBOutlet MenuTrackedRootView* editItem; 139 @property(retain, nonatomic) IBOutlet MenuTrackedRootView* editItem;
137 @property(retain, nonatomic) IBOutlet NSButton* editCut; 140 @property(retain, nonatomic) IBOutlet NSButton* editCut;
138 @property(retain, nonatomic) IBOutlet NSButton* editCopy; 141 @property(retain, nonatomic) IBOutlet NSButton* editCopy;
139 @property(retain, nonatomic) IBOutlet NSButton* editPaste; 142 @property(retain, nonatomic) IBOutlet NSButton* editPaste;
140 @property(retain, nonatomic) IBOutlet MenuTrackedRootView* zoomItem; 143 @property(retain, nonatomic) IBOutlet MenuTrackedRootView* zoomItem;
141 @property(retain, nonatomic) IBOutlet NSButton* zoomPlus; 144 @property(retain, nonatomic) IBOutlet NSButton* zoomPlus;
142 @property(retain, nonatomic) IBOutlet NSButton* zoomDisplay; 145 @property(retain, nonatomic) IBOutlet NSButton* zoomDisplay;
143 @property(retain, nonatomic) IBOutlet NSButton* zoomMinus; 146 @property(retain, nonatomic) IBOutlet NSButton* zoomMinus;
144 @property(retain, nonatomic) IBOutlet NSButton* zoomFullScreen; 147 @property(retain, nonatomic) IBOutlet NSButton* zoomFullScreen;
145 @property(retain, nonatomic) 148 @property(retain, nonatomic)
146 IBOutlet MenuTrackedRootView* toolbarActionsOverflowItem; 149 IBOutlet MenuTrackedRootView* toolbarActionsOverflowItem;
147 @property(retain, nonatomic) 150 @property(retain, nonatomic)
148 IBOutlet BrowserActionsContainerView* overflowActionsContainerView; 151 IBOutlet BrowserActionsContainerView* overflowActionsContainerView;
149 152
150 - (id)initWithController:(AppMenuController*)controller; 153 - (id)initWithController:(AppMenuController*)controller;
151 - (IBAction)dispatchAppMenuCommand:(id)sender; 154 - (IBAction)dispatchAppMenuCommand:(id)sender;
152 155
153 @end 156 @end
154 157
155 #endif // CHROME_BROWSER_UI_COCOA_APP_MENU_APP_MENU_CONTROLLER_H_ 158 #endif // CHROME_BROWSER_UI_COCOA_APP_MENU_APP_MENU_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698