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

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

Issue 165499: Updates to clean up default theme and add hover states (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 11 years, 3 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
« no previous file with comments | « chrome/browser/cocoa/tab_view_unittest.mm ('k') | chrome/browser/cocoa/toolbar_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) 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 // Used to positioner the omnibox popup view. 58 // Used to positioner the omnibox popup view.
59 scoped_ptr<AutocompletePopupPositioner> popupPositioner_; 59 scoped_ptr<AutocompletePopupPositioner> popupPositioner_;
60 BooleanPrefMember showHomeButton_; 60 BooleanPrefMember showHomeButton_;
61 BooleanPrefMember showPageOptionButtons_; 61 BooleanPrefMember showPageOptionButtons_;
62 BOOL hasToolbar_; // if NO, we only have the location bar. 62 BOOL hasToolbar_; // if NO, we only have the location bar.
63 63
64 // We have an extra retain in the locationBar_. 64 // We have an extra retain in the locationBar_.
65 // See comments in awakeFromNib for more info. 65 // See comments in awakeFromNib for more info.
66 scoped_nsobject<AutocompleteTextField> locationBarRetainer_; 66 scoped_nsobject<AutocompleteTextField> locationBarRetainer_;
67 67
68 // Tracking area for mouse enter/exit/moved in the toolbar.
69 scoped_nsobject<NSTrackingArea> trackingArea_;
70 NSButton* hoveredButton_; // weak. Button under the mouse cursor.
71
68 IBOutlet NSMenu* pageMenu_; 72 IBOutlet NSMenu* pageMenu_;
69 IBOutlet NSMenu* wrenchMenu_; 73 IBOutlet NSMenu* wrenchMenu_;
70 74
71 // The ordering is important for unit tests. If new items are added or the 75 // The ordering is important for unit tests. If new items are added or the
72 // ordering is changed, make sure to update |-toolbarViews| and the 76 // ordering is changed, make sure to update |-toolbarViews| and the
73 // corresponding enum in the unit tests. 77 // corresponding enum in the unit tests.
74 IBOutlet DelayedMenuButton* backButton_; 78 IBOutlet DelayedMenuButton* backButton_;
75 IBOutlet DelayedMenuButton* forwardButton_; 79 IBOutlet DelayedMenuButton* forwardButton_;
76 IBOutlet NSButton* reloadButton_; 80 IBOutlet NSButton* reloadButton_;
77 IBOutlet NSButton* homeButton_; 81 IBOutlet NSButton* homeButton_;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 // A set of private methods used by tests, in the absence of "friends" in ObjC. 144 // A set of private methods used by tests, in the absence of "friends" in ObjC.
141 @interface ToolbarController(PrivateTestMethods) 145 @interface ToolbarController(PrivateTestMethods)
142 // Returns an array of views in the order of the outlets above. 146 // Returns an array of views in the order of the outlets above.
143 - (NSArray*)toolbarViews; 147 - (NSArray*)toolbarViews;
144 - (void)showOptionalHomeButton; 148 - (void)showOptionalHomeButton;
145 - (void)showOptionalPageWrenchButtons; 149 - (void)showOptionalPageWrenchButtons;
146 - (gfx::Rect)autocompletePopupPosition; 150 - (gfx::Rect)autocompletePopupPosition;
147 @end 151 @end
148 152
149 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ 153 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/tab_view_unittest.mm ('k') | chrome/browser/cocoa/toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698