chrome/browser/ui/cocoa/toolbar/toolbar_controller.h - Issue 10833056: Add a menu to the Action Box Button.

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

Issue 10833056: Add a menu to the Action Box Button. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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 | Annotate | Revision Log

« chrome/browser/ui/cocoa/location_bar/plus_decoration.mm ('K') | « chrome/browser/ui/cocoa/location_bar/plus_decoration.mm ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm » ('j') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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_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/memory/scoped_nsobject.h"	10 #include "base/memory/scoped_nsobject.h"

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 Profile* profile_; // weak, one per window	63 Profile* profile_; // weak, one per window

64 Browser* browser_; // weak, one per window	64 Browser* browser_; // weak, one per window

65 scoped_ptr<CommandObserverBridge> commandObserver_;	65 scoped_ptr<CommandObserverBridge> commandObserver_;

66 scoped_ptr<LocationBarViewMac> locationBarView_;	66 scoped_ptr<LocationBarViewMac> locationBarView_;

67 scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_;	67 scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_;

68 id<ViewResizer> resizeDelegate_; // weak	68 id<ViewResizer> resizeDelegate_; // weak

69 scoped_nsobject<BackForwardMenuController> backMenuController_;	69 scoped_nsobject<BackForwardMenuController> backMenuController_;

70 scoped_nsobject<BackForwardMenuController> forwardMenuController_;	70 scoped_nsobject<BackForwardMenuController> forwardMenuController_;

71 scoped_nsobject<BrowserActionsController> browserActionsController_;	71 scoped_nsobject<BrowserActionsController> browserActionsController_;

72	72

73 // Lazily-instantiated menu controller.	73 // Lazily-instantiated wrench menu controller.
	Scott Hess - ex-Googler 2012/07/27 20:31:06 Drop this change if you aren't making other change Drop this change if you aren't making other changes in here. Well, even if you are, I can figure out it refers to the wrench menu :-). beaudoin 2012/08/01 02:23:26 Done. Show quoted text On 2012/07/27 20:31:06, shess wrote: > Drop this change if you aren't making other changes in here. Well, even if you > are, I can figure out it refers to the wrench menu :-). Done.
74 scoped_nsobject<WrenchMenuController> wrenchMenuController_;	74 scoped_nsobject<WrenchMenuController> wrenchMenuController_;

75	75

76 // Used for monitoring the optional toolbar button prefs.	76 // Used for monitoring the optional toolbar button prefs.

77 scoped_ptr<ToolbarControllerInternal::NotificationBridge> notificationBridge_;	77 scoped_ptr<ToolbarControllerInternal::NotificationBridge> notificationBridge_;

78 BooleanPrefMember showHomeButton_;	78 BooleanPrefMember showHomeButton_;

79 BOOL hasToolbar_; // If NO, we may have only the location bar.	79 BOOL hasToolbar_; // If NO, we may have only the location bar.

80 BOOL hasLocationBar_; // If \|hasToolbar_\| is YES, this must also be YES.	80 BOOL hasLocationBar_; // If \|hasToolbar_\| is YES, this must also be YES.

81 BOOL locationBarAtMinSize_; // If the location bar is at the minimum size.	81 BOOL locationBarAtMinSize_; // If the location bar is at the minimum size.

82	82

83 // We have an extra retain in the locationBar_.	83 // We have an extra retain in the locationBar_.

(...skipping 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
181 // Returns an array of views in the order of the outlets above.	181 // Returns an array of views in the order of the outlets above.

182 - (NSArray*)toolbarViews;	182 - (NSArray*)toolbarViews;

183 - (void)showOptionalHomeButton;	183 - (void)showOptionalHomeButton;

184 - (void)installWrenchMenu;	184 - (void)installWrenchMenu;

185 - (WrenchMenuController*)wrenchMenuController;	185 - (WrenchMenuController*)wrenchMenuController;

186 // Return a hover button for the current event.	186 // Return a hover button for the current event.

187 - (NSButton)hoverButtonForEvent:(NSEvent)theEvent;	187 - (NSButton)hoverButtonForEvent:(NSEvent)theEvent;

188 @end	188 @end

189	189

190 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_	190 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_

OLD	NEW