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

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

Issue 811002: Merge 41114 - [Mac] More progress towards resizing the Browser Actions contai... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/342/src/
Patch Set: Created 10 years, 9 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_COCOA_TOOLBAR_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
6 #define CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ 6 #define CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 scoped_nsobject<MenuController> appMenuController_; 69 scoped_nsobject<MenuController> appMenuController_;
70 70
71 // Used for monitoring the optional toolbar button prefs. 71 // Used for monitoring the optional toolbar button prefs.
72 scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_; 72 scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_;
73 // Used to position the omnibox bubble. 73 // Used to position the omnibox bubble.
74 scoped_ptr<BubblePositioner> bubblePositioner_; 74 scoped_ptr<BubblePositioner> bubblePositioner_;
75 BooleanPrefMember showHomeButton_; 75 BooleanPrefMember showHomeButton_;
76 BooleanPrefMember showPageOptionButtons_; 76 BooleanPrefMember showPageOptionButtons_;
77 BOOL hasToolbar_; // If NO, we may have only the location bar. 77 BOOL hasToolbar_; // If NO, we may have only the location bar.
78 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES. 78 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES.
79 BOOL locationBarAtMinSize_; // If the location bar is at the minimum size.
79 80
80 // We have an extra retain in the locationBar_. 81 // We have an extra retain in the locationBar_.
81 // See comments in awakeFromNib for more info. 82 // See comments in awakeFromNib for more info.
82 scoped_nsobject<AutocompleteTextField> locationBarRetainer_; 83 scoped_nsobject<AutocompleteTextField> locationBarRetainer_;
83 84
84 // Tracking area for mouse enter/exit/moved in the toolbar. 85 // Tracking area for mouse enter/exit/moved in the toolbar.
85 scoped_nsobject<NSTrackingArea> trackingArea_; 86 scoped_nsobject<NSTrackingArea> trackingArea_;
86 87
87 // We retain/release the hover button since interaction with the 88 // We retain/release the hover button since interaction with the
88 // button may make it go away (e.g. delete menu option over a 89 // button may make it go away (e.g. delete menu option over a
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 // Returns an array of views in the order of the outlets above. 170 // Returns an array of views in the order of the outlets above.
170 - (NSArray*)toolbarViews; 171 - (NSArray*)toolbarViews;
171 - (void)showOptionalHomeButton; 172 - (void)showOptionalHomeButton;
172 - (void)showOptionalPageWrenchButtons; 173 - (void)showOptionalPageWrenchButtons;
173 - (gfx::Rect)locationStackBounds; 174 - (gfx::Rect)locationStackBounds;
174 // Return a hover button for the current event. 175 // Return a hover button for the current event.
175 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent; 176 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
176 @end 177 @end
177 178
178 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ 179 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/extensions/browser_actions_controller.mm ('k') | chrome/browser/cocoa/toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698