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

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

Issue 173439: [Mac] The autocomplete popup now gets its position from the toolbar controlle... (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
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"
11 #include "base/scoped_nsobject.h" 11 #include "base/scoped_nsobject.h"
12 #import "chrome/browser/cocoa/command_observer_bridge.h" 12 #import "chrome/browser/cocoa/command_observer_bridge.h"
13 #import "chrome/browser/cocoa/bookmark_bar_controller.h" 13 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
14 #import "chrome/browser/cocoa/delayedmenu_button.h" 14 #import "chrome/browser/cocoa/delayedmenu_button.h"
15 #import "chrome/browser/cocoa/view_resizer.h" 15 #import "chrome/browser/cocoa/view_resizer.h"
16 #include "chrome/common/pref_member.h" 16 #include "chrome/common/pref_member.h"
17 17
18 class AutocompletePopupPositioner;
18 @class AutocompleteTextField; 19 @class AutocompleteTextField;
19 @class AutocompleteTextFieldEditor; 20 @class AutocompleteTextFieldEditor;
20 @class DelayedMenuButton; 21 @class DelayedMenuButton;
21 @class BackForwardMenuController; 22 @class BackForwardMenuController;
22 class Browser; 23 class Browser;
23 class CommandUpdater; 24 class CommandUpdater;
24 class LocationBar; 25 class LocationBar;
25 class LocationBarViewMac; 26 class LocationBarViewMac;
26 namespace ToolbarControllerInternal { 27 namespace ToolbarControllerInternal {
27 class PrefObserverBridge; 28 class PrefObserverBridge;
(...skipping 19 matching lines...) Expand all
47 scoped_ptr<LocationBarViewMac> locationBarView_; 48 scoped_ptr<LocationBarViewMac> locationBarView_;
48 scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_; 49 scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_;
49 scoped_nsobject<BookmarkBarController> bookmarkBarController_; 50 scoped_nsobject<BookmarkBarController> bookmarkBarController_;
50 id<ViewResizer> resizeDelegate_; // weak 51 id<ViewResizer> resizeDelegate_; // weak
51 id<BookmarkURLOpener> bookmarkBarDelegate_; // weak 52 id<BookmarkURLOpener> bookmarkBarDelegate_; // weak
52 scoped_nsobject<BackForwardMenuController> backMenuController_; 53 scoped_nsobject<BackForwardMenuController> backMenuController_;
53 scoped_nsobject<BackForwardMenuController> forwardMenuController_; 54 scoped_nsobject<BackForwardMenuController> forwardMenuController_;
54 55
55 // Used for monitoring the optional toolbar button prefs. 56 // Used for monitoring the optional toolbar button prefs.
56 scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_; 57 scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_;
58 // Used to positioner the omnibox popup view.
59 scoped_ptr<AutocompletePopupPositioner> popupPositioner_;
57 BooleanPrefMember showHomeButton_; 60 BooleanPrefMember showHomeButton_;
58 BooleanPrefMember showPageOptionButtons_; 61 BooleanPrefMember showPageOptionButtons_;
59 BOOL hasToolbar_; // if NO, we only have the location bar. 62 BOOL hasToolbar_; // if NO, we only have the location bar.
60 63
61 // We have an extra retain in the locationBar_. 64 // We have an extra retain in the locationBar_.
62 // See comments in awakeFromNib for more info. 65 // See comments in awakeFromNib for more info.
63 scoped_nsobject<AutocompleteTextField> locationBarRetainer_; 66 scoped_nsobject<AutocompleteTextField> locationBarRetainer_;
64 67
65 IBOutlet NSMenu* pageMenu_; 68 IBOutlet NSMenu* pageMenu_;
66 IBOutlet NSMenu* wrenchMenu_; 69 IBOutlet NSMenu* wrenchMenu_;
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 - (NSRect)starButtonInWindowCoordinates; 136 - (NSRect)starButtonInWindowCoordinates;
134 137
135 @end 138 @end
136 139
137 // A set of private methods used by tests, in the absence of "friends" in ObjC. 140 // A set of private methods used by tests, in the absence of "friends" in ObjC.
138 @interface ToolbarController(PrivateTestMethods) 141 @interface ToolbarController(PrivateTestMethods)
139 // Returns an array of views in the order of the outlets above. 142 // Returns an array of views in the order of the outlets above.
140 - (NSArray*)toolbarViews; 143 - (NSArray*)toolbarViews;
141 - (void)showOptionalHomeButton; 144 - (void)showOptionalHomeButton;
142 - (void)showOptionalPageWrenchButtons; 145 - (void)showOptionalPageWrenchButtons;
146 - (gfx::Rect)autocompletePopupPosition;
143 @end 147 @end
144 148
145 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ 149 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/location_bar_view_mac_unittest.mm ('k') | chrome/browser/cocoa/toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698