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

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

Issue 1419993010: chrome: Rename WrenchMenuController to AppMenuController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes 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 (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_TOOLBAR_TOOLBAR_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/mac/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
(...skipping 10 matching lines...) Expand all
21 class Browser; 21 class Browser;
22 @class BrowserActionsContainerView; 22 @class BrowserActionsContainerView;
23 class BrowserActionsContainerViewSizeDelegate; 23 class BrowserActionsContainerViewSizeDelegate;
24 @class BrowserActionsController; 24 @class BrowserActionsController;
25 class CommandUpdater; 25 class CommandUpdater;
26 class LocationBarViewMac; 26 class LocationBarViewMac;
27 @class MenuButton; 27 @class MenuButton;
28 class Profile; 28 class Profile;
29 @class ReloadButton; 29 @class ReloadButton;
30 @class ToolbarButton; 30 @class ToolbarButton;
31 @class WrenchMenuController; 31 @class AppMenuController;
32 32
33 namespace content { 33 namespace content {
34 class WebContents; 34 class WebContents;
35 } 35 }
36 36
37 namespace ToolbarControllerInternal { 37 namespace ToolbarControllerInternal {
38 class CommandObserverBridge; 38 class CommandObserverBridge;
39 class NotificationBridge; 39 class NotificationBridge;
40 } 40 }
41 41
(...skipping 24 matching lines...) Expand all
66 scoped_ptr<LocationBarViewMac> locationBarView_; 66 scoped_ptr<LocationBarViewMac> locationBarView_;
67 base::scoped_nsobject<AutocompleteTextFieldEditor> 67 base::scoped_nsobject<AutocompleteTextFieldEditor>
68 autocompleteTextFieldEditor_; 68 autocompleteTextFieldEditor_;
69 base::scoped_nsobject<BackForwardMenuController> backMenuController_; 69 base::scoped_nsobject<BackForwardMenuController> backMenuController_;
70 base::scoped_nsobject<BackForwardMenuController> forwardMenuController_; 70 base::scoped_nsobject<BackForwardMenuController> forwardMenuController_;
71 base::scoped_nsobject<BrowserActionsController> browserActionsController_; 71 base::scoped_nsobject<BrowserActionsController> browserActionsController_;
72 scoped_ptr<BrowserActionsContainerViewSizeDelegate> 72 scoped_ptr<BrowserActionsContainerViewSizeDelegate>
73 browserActionsContainerDelegate_; 73 browserActionsContainerDelegate_;
74 74
75 // Lazily-instantiated menu controller. 75 // Lazily-instantiated menu controller.
76 base::scoped_nsobject<WrenchMenuController> wrenchMenuController_; 76 base::scoped_nsobject<AppMenuController> appMenuController_;
77 77
78 // Used for monitoring the optional toolbar button prefs. 78 // Used for monitoring the optional toolbar button prefs.
79 scoped_ptr<ToolbarControllerInternal::NotificationBridge> notificationBridge_; 79 scoped_ptr<ToolbarControllerInternal::NotificationBridge> notificationBridge_;
80 BooleanPrefMember showHomeButton_; 80 BooleanPrefMember showHomeButton_;
81 BOOL hasToolbar_; // If NO, we may have only the location bar. 81 BOOL hasToolbar_; // If NO, we may have only the location bar.
82 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES. 82 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES.
83 BOOL locationBarAtMinSize_; // If the location bar is at the minimum size. 83 BOOL locationBarAtMinSize_; // If the location bar is at the minimum size.
84 84
85 // Tracking area for mouse enter/exit/moved in the toolbar. 85 // Tracking area for mouse enter/exit/moved in the toolbar.
86 ui::ScopedCrTrackingArea trackingArea_; 86 ui::ScopedCrTrackingArea trackingArea_;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 // Updates the visibility of the toolbar, with an optional animation. 168 // Updates the visibility of the toolbar, with an optional animation.
169 - (void)updateVisibility:(BOOL)visible withAnimation:(BOOL)animate; 169 - (void)updateVisibility:(BOOL)visible withAnimation:(BOOL)animate;
170 170
171 // Return the BrowserActionsController for this toolbar. 171 // Return the BrowserActionsController for this toolbar.
172 - (BrowserActionsController*)browserActionsController; 172 - (BrowserActionsController*)browserActionsController;
173 173
174 // Returns the wrench button. 174 // Returns the wrench button.
175 - (NSButton*)wrenchButton; 175 - (NSButton*)wrenchButton;
176 176
177 // Returns the wrench menu controller. 177 // Returns the app menu controller.
178 - (WrenchMenuController*)wrenchMenuController; 178 - (AppMenuController*)appMenuController;
179 179
180 @end 180 @end
181 181
182 // A set of private methods used by tests, in the absence of "friends" in ObjC. 182 // A set of private methods used by tests, in the absence of "friends" in ObjC.
183 @interface ToolbarController(PrivateTestMethods) 183 @interface ToolbarController(PrivateTestMethods)
184 // Returns an array of views in the order of the outlets above. 184 // Returns an array of views in the order of the outlets above.
185 - (NSArray*)toolbarViews; 185 - (NSArray*)toolbarViews;
186 - (void)showOptionalHomeButton; 186 - (void)showOptionalHomeButton;
187 - (void)installWrenchMenu; 187 - (void)installWrenchMenu;
188 // Return a hover button for the current event. 188 // Return a hover button for the current event.
189 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent; 189 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
190 @end 190 @end
191 191
192 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_ 192 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698