| OLD | NEW |
| 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/toolbar_compressable.h" | 13 #import "chrome/browser/cocoa/toolbar_compressable.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 AutocompleteTextField; | 18 @class AutocompleteTextField; |
| 19 @class AutocompleteTextFieldEditor; | 19 @class AutocompleteTextFieldEditor; |
| 20 @class BackForwardMenuController; | 20 @class BackForwardMenuController; |
| 21 @class BackgroundGradientView; | 21 @class BackgroundGradientView; |
| 22 class Browser; | 22 class Browser; |
| 23 @class BrowserActionsController; |
| 23 class BubblePositioner; | 24 class BubblePositioner; |
| 24 class CommandUpdater; | 25 class CommandUpdater; |
| 25 @class DelayedMenuButton; | 26 @class DelayedMenuButton; |
| 26 class LocationBar; | 27 class LocationBar; |
| 27 class LocationBarViewMac; | 28 class LocationBarViewMac; |
| 28 @class MenuButton; | 29 @class MenuButton; |
| 29 namespace ToolbarControllerInternal { | 30 namespace ToolbarControllerInternal { |
| 30 class PrefObserverBridge; | 31 class PrefObserverBridge; |
| 31 } | 32 } |
| 32 class Profile; | 33 class Profile; |
| (...skipping 12 matching lines...) Expand all Loading... |
| 45 ToolbarModel* toolbarModel_; // weak, one per window | 46 ToolbarModel* toolbarModel_; // weak, one per window |
| 46 CommandUpdater* commands_; // weak, one per window | 47 CommandUpdater* commands_; // weak, one per window |
| 47 Profile* profile_; // weak, one per window | 48 Profile* profile_; // weak, one per window |
| 48 Browser* browser_; // weak, one per window | 49 Browser* browser_; // weak, one per window |
| 49 scoped_ptr<CommandObserverBridge> commandObserver_; | 50 scoped_ptr<CommandObserverBridge> commandObserver_; |
| 50 scoped_ptr<LocationBarViewMac> locationBarView_; | 51 scoped_ptr<LocationBarViewMac> locationBarView_; |
| 51 scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_; | 52 scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_; |
| 52 id<ViewResizer> resizeDelegate_; // weak | 53 id<ViewResizer> resizeDelegate_; // weak |
| 53 scoped_nsobject<BackForwardMenuController> backMenuController_; | 54 scoped_nsobject<BackForwardMenuController> backMenuController_; |
| 54 scoped_nsobject<BackForwardMenuController> forwardMenuController_; | 55 scoped_nsobject<BackForwardMenuController> forwardMenuController_; |
| 56 scoped_nsobject<BrowserActionsController> browserActionsController_; |
| 55 | 57 |
| 56 // Used for monitoring the optional toolbar button prefs. | 58 // Used for monitoring the optional toolbar button prefs. |
| 57 scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_; | 59 scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_; |
| 58 // Used to position the omnibox bubble. | 60 // Used to position the omnibox bubble. |
| 59 scoped_ptr<BubblePositioner> bubblePositioner_; | 61 scoped_ptr<BubblePositioner> bubblePositioner_; |
| 60 BooleanPrefMember showHomeButton_; | 62 BooleanPrefMember showHomeButton_; |
| 61 BooleanPrefMember showPageOptionButtons_; | 63 BooleanPrefMember showPageOptionButtons_; |
| 62 BOOL hasToolbar_; // if NO, we only have the location bar. | 64 BOOL hasToolbar_; // if NO, we only have the location bar. |
| 63 | 65 |
| 64 // We have an extra retain in the locationBar_. | 66 // We have an extra retain in the locationBar_. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 81 IBOutlet DelayedMenuButton* backButton_; | 83 IBOutlet DelayedMenuButton* backButton_; |
| 82 IBOutlet DelayedMenuButton* forwardButton_; | 84 IBOutlet DelayedMenuButton* forwardButton_; |
| 83 IBOutlet NSButton* reloadButton_; | 85 IBOutlet NSButton* reloadButton_; |
| 84 IBOutlet NSButton* homeButton_; | 86 IBOutlet NSButton* homeButton_; |
| 85 IBOutlet NSButton* starButton_; | 87 IBOutlet NSButton* starButton_; |
| 86 IBOutlet NSButton* goButton_; | 88 IBOutlet NSButton* goButton_; |
| 87 IBOutlet MenuButton* pageButton_; | 89 IBOutlet MenuButton* pageButton_; |
| 88 IBOutlet MenuButton* wrenchButton_; | 90 IBOutlet MenuButton* wrenchButton_; |
| 89 IBOutlet AutocompleteTextField* locationBar_; | 91 IBOutlet AutocompleteTextField* locationBar_; |
| 90 IBOutlet NSMenu* encodingMenu_; | 92 IBOutlet NSMenu* encodingMenu_; |
| 93 IBOutlet NSView* browserActionContainerView_; |
| 91 } | 94 } |
| 92 | 95 |
| 93 // Initialize the toolbar and register for command updates. The profile is | 96 // Initialize the toolbar and register for command updates. The profile is |
| 94 // needed for initializing the location bar. The browser is needed for | 97 // needed for initializing the location bar. The browser is needed for |
| 95 // initializing the back/forward menus. | 98 // initializing the back/forward menus. |
| 96 - (id)initWithModel:(ToolbarModel*)model | 99 - (id)initWithModel:(ToolbarModel*)model |
| 97 commands:(CommandUpdater*)commands | 100 commands:(CommandUpdater*)commands |
| 98 profile:(Profile*)profile | 101 profile:(Profile*)profile |
| 99 browser:(Browser*)browser | 102 browser:(Browser*)browser |
| 100 resizeDelegate:(id<ViewResizer>)resizeDelegate; | 103 resizeDelegate:(id<ViewResizer>)resizeDelegate; |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 // Returns an array of views in the order of the outlets above. | 147 // Returns an array of views in the order of the outlets above. |
| 145 - (NSArray*)toolbarViews; | 148 - (NSArray*)toolbarViews; |
| 146 - (void)showOptionalHomeButton; | 149 - (void)showOptionalHomeButton; |
| 147 - (void)showOptionalPageWrenchButtons; | 150 - (void)showOptionalPageWrenchButtons; |
| 148 - (gfx::Rect)locationStackBounds; | 151 - (gfx::Rect)locationStackBounds; |
| 149 // Return a hover button for the current event. | 152 // Return a hover button for the current event. |
| 150 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent; | 153 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent; |
| 151 @end | 154 @end |
| 152 | 155 |
| 153 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ | 156 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ |
| OLD | NEW |