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" |
(...skipping 24 matching lines...) Expand all Loading... |
35 @private | 35 @private |
36 ToolbarModel* toolbarModel_; // weak, one per window | 36 ToolbarModel* toolbarModel_; // weak, one per window |
37 CommandUpdater* commands_; // weak, one per window | 37 CommandUpdater* commands_; // weak, one per window |
38 Profile* profile_; // weak, one per window | 38 Profile* profile_; // weak, one per window |
39 scoped_ptr<CommandObserverBridge> commandObserver_; | 39 scoped_ptr<CommandObserverBridge> commandObserver_; |
40 scoped_ptr<LocationBarViewMac> locationBarView_; | 40 scoped_ptr<LocationBarViewMac> locationBarView_; |
41 scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_; | 41 scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_; |
42 scoped_nsobject<BookmarkBarController> bookmarkBarController_; | 42 scoped_nsobject<BookmarkBarController> bookmarkBarController_; |
43 id<BookmarkURLOpener> bookmarkBarDelegate_; // weak | 43 id<BookmarkURLOpener> bookmarkBarDelegate_; // weak |
44 NSView* webContentView_; // weak; where the web goes | 44 NSView* webContentView_; // weak; where the web goes |
| 45 NSView* infoBarsView_; // weak; where the infobars go |
45 | 46 |
46 // Used for monitoring the optional toolbar button prefs. | 47 // Used for monitoring the optional toolbar button prefs. |
47 scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_; | 48 scoped_ptr<ToolbarControllerInternal::PrefObserverBridge> prefObserver_; |
48 BooleanPrefMember showHomeButton_; | 49 BooleanPrefMember showHomeButton_; |
49 BooleanPrefMember showPageOptionButtons_; | 50 BooleanPrefMember showPageOptionButtons_; |
50 BOOL hasToolbar_; // if NO, we only have the location bar. | 51 BOOL hasToolbar_; // if NO, we only have the location bar. |
51 | 52 |
52 IBOutlet NSMenu* pageMenu_; | 53 IBOutlet NSMenu* pageMenu_; |
53 IBOutlet NSMenu* wrenchMenu_; | 54 IBOutlet NSMenu* wrenchMenu_; |
54 | 55 |
(...skipping 10 matching lines...) Expand all Loading... |
65 IBOutlet NSButton* wrenchButton_; | 66 IBOutlet NSButton* wrenchButton_; |
66 IBOutlet AutocompleteTextField* locationBar_; | 67 IBOutlet AutocompleteTextField* locationBar_; |
67 } | 68 } |
68 | 69 |
69 // Initialize the toolbar and register for command updates. The profile is | 70 // Initialize the toolbar and register for command updates. The profile is |
70 // needed for initializing the location bar. | 71 // needed for initializing the location bar. |
71 - (id)initWithModel:(ToolbarModel*)model | 72 - (id)initWithModel:(ToolbarModel*)model |
72 commands:(CommandUpdater*)commands | 73 commands:(CommandUpdater*)commands |
73 profile:(Profile*)profile | 74 profile:(Profile*)profile |
74 webContentView:(NSView*)webContentView | 75 webContentView:(NSView*)webContentView |
| 76 infoBarsView:(NSView*)infoBarsView |
75 bookmarkDelegate:(id<BookmarkURLOpener>)delegate; | 77 bookmarkDelegate:(id<BookmarkURLOpener>)delegate; |
76 | 78 |
77 // Get the C++ bridge object representing the location bar for this tab. | 79 // Get the C++ bridge object representing the location bar for this tab. |
78 - (LocationBar*)locationBar; | 80 - (LocationBar*)locationBar; |
79 | 81 |
80 // Called by the Window delegate so we can provide a custom field editor if | 82 // Called by the Window delegate so we can provide a custom field editor if |
81 // needed. | 83 // needed. |
82 // Note that this may be called for objects unrelated to the toolbar. | 84 // Note that this may be called for objects unrelated to the toolbar. |
83 // returns nil if we don't want to override the custom field editor for |obj|. | 85 // returns nil if we don't want to override the custom field editor for |obj|. |
84 - (id)customFieldEditorForObject:(id)obj; | 86 - (id)customFieldEditorForObject:(id)obj; |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 | 119 |
118 // A set of private methods used by tests, in the absence of "friends" in ObjC. | 120 // A set of private methods used by tests, in the absence of "friends" in ObjC. |
119 @interface ToolbarController(PrivateTestMethods) | 121 @interface ToolbarController(PrivateTestMethods) |
120 // Returns an array of views in the order of the outlets above. | 122 // Returns an array of views in the order of the outlets above. |
121 - (NSArray*)toolbarViews; | 123 - (NSArray*)toolbarViews; |
122 - (void)showOptionalHomeButton; | 124 - (void)showOptionalHomeButton; |
123 - (void)showOptionalPageWrenchButtons; | 125 - (void)showOptionalPageWrenchButtons; |
124 @end | 126 @end |
125 | 127 |
126 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ | 128 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ |
OLD | NEW |