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

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

Issue 1009613002: [Toolbar UI Mac] Fix omnibox minimum width (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Avi's Created 5 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
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"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/prefs/pref_member.h" 12 #include "base/prefs/pref_member.h"
13 #import "chrome/browser/ui/cocoa/command_observer_bridge.h" 13 #import "chrome/browser/ui/cocoa/command_observer_bridge.h"
14 #import "chrome/browser/ui/cocoa/url_drop_target.h" 14 #import "chrome/browser/ui/cocoa/url_drop_target.h"
15 #import "chrome/browser/ui/cocoa/view_resizer.h" 15 #import "chrome/browser/ui/cocoa/view_resizer.h"
16 #import "ui/base/cocoa/tracking_area.h" 16 #import "ui/base/cocoa/tracking_area.h"
17 17
18 @class AutocompleteTextField; 18 @class AutocompleteTextField;
19 @class AutocompleteTextFieldEditor; 19 @class AutocompleteTextFieldEditor;
20 @class BackForwardMenuController; 20 @class BackForwardMenuController;
21 class Browser; 21 class Browser;
22 @class BrowserActionsContainerView; 22 @class BrowserActionsContainerView;
23 class BrowserActionsContainerViewSizeDelegate;
23 @class BrowserActionsController; 24 @class BrowserActionsController;
24 class CommandUpdater; 25 class CommandUpdater;
25 class LocationBarViewMac; 26 class LocationBarViewMac;
26 @class MenuButton; 27 @class MenuButton;
27 class Profile; 28 class Profile;
28 @class ReloadButton; 29 @class ReloadButton;
29 @class ToolbarButton; 30 @class ToolbarButton;
30 @class WrenchMenuController; 31 @class WrenchMenuController;
31 32
32 namespace content { 33 namespace content {
(...skipping 28 matching lines...) Expand all
61 Profile* profile_; // weak, one per window 62 Profile* profile_; // weak, one per window
62 Browser* browser_; // weak, one per window 63 Browser* browser_; // weak, one per window
63 scoped_ptr<CommandObserverBridge> commandObserver_; 64 scoped_ptr<CommandObserverBridge> commandObserver_;
64 scoped_ptr<LocationBarViewMac> locationBarView_; 65 scoped_ptr<LocationBarViewMac> locationBarView_;
65 base::scoped_nsobject<AutocompleteTextFieldEditor> 66 base::scoped_nsobject<AutocompleteTextFieldEditor>
66 autocompleteTextFieldEditor_; 67 autocompleteTextFieldEditor_;
67 id<ViewResizer> resizeDelegate_; // weak 68 id<ViewResizer> resizeDelegate_; // weak
68 base::scoped_nsobject<BackForwardMenuController> backMenuController_; 69 base::scoped_nsobject<BackForwardMenuController> backMenuController_;
69 base::scoped_nsobject<BackForwardMenuController> forwardMenuController_; 70 base::scoped_nsobject<BackForwardMenuController> forwardMenuController_;
70 base::scoped_nsobject<BrowserActionsController> browserActionsController_; 71 base::scoped_nsobject<BrowserActionsController> browserActionsController_;
72 scoped_ptr<BrowserActionsContainerViewSizeDelegate>
73 browserActionsContainerDelegate_;
71 74
72 // Lazily-instantiated menu controller. 75 // Lazily-instantiated menu controller.
73 base::scoped_nsobject<WrenchMenuController> wrenchMenuController_; 76 base::scoped_nsobject<WrenchMenuController> wrenchMenuController_;
74 77
75 // Used for monitoring the optional toolbar button prefs. 78 // Used for monitoring the optional toolbar button prefs.
76 scoped_ptr<ToolbarControllerInternal::NotificationBridge> notificationBridge_; 79 scoped_ptr<ToolbarControllerInternal::NotificationBridge> notificationBridge_;
77 BooleanPrefMember showHomeButton_; 80 BooleanPrefMember showHomeButton_;
78 BOOL hasToolbar_; // If NO, we may have only the location bar. 81 BOOL hasToolbar_; // If NO, we may have only the location bar.
79 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES. 82 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES.
80 BOOL locationBarAtMinSize_; // If the location bar is at the minimum size. 83 BOOL locationBarAtMinSize_; // If the location bar is at the minimum size.
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 @interface ToolbarController(PrivateTestMethods) 195 @interface ToolbarController(PrivateTestMethods)
193 // Returns an array of views in the order of the outlets above. 196 // Returns an array of views in the order of the outlets above.
194 - (NSArray*)toolbarViews; 197 - (NSArray*)toolbarViews;
195 - (void)showOptionalHomeButton; 198 - (void)showOptionalHomeButton;
196 - (void)installWrenchMenu; 199 - (void)installWrenchMenu;
197 // Return a hover button for the current event. 200 // Return a hover button for the current event.
198 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent; 201 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
199 @end 202 @end
200 203
201 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_ 204 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698