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

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

Issue 155358: More bookmark bar changes.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 #include "chrome/common/pref_member.h" 14 #include "chrome/common/pref_member.h"
15 15
16 @class BookmarkBarView;
17 class CommandUpdater; 16 class CommandUpdater;
18 class LocationBar; 17 class LocationBar;
19 class LocationBarViewMac; 18 class LocationBarViewMac;
20 namespace ToolbarControllerInternal { 19 namespace ToolbarControllerInternal {
21 class PrefObserverBridge; 20 class PrefObserverBridge;
22 } 21 }
23 class Profile; 22 class Profile;
24 class TabContents; 23 class TabContents;
25 class ToolbarModel; 24 class ToolbarModel;
26 class ToolbarView; 25 class ToolbarView;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 // corresponding enum in the unit tests. 63 // corresponding enum in the unit tests.
65 IBOutlet NSButton* backButton_; 64 IBOutlet NSButton* backButton_;
66 IBOutlet NSButton* forwardButton_; 65 IBOutlet NSButton* forwardButton_;
67 IBOutlet NSButton* reloadButton_; 66 IBOutlet NSButton* reloadButton_;
68 IBOutlet NSButton* homeButton_; 67 IBOutlet NSButton* homeButton_;
69 IBOutlet NSButton* starButton_; 68 IBOutlet NSButton* starButton_;
70 IBOutlet NSButton* goButton_; 69 IBOutlet NSButton* goButton_;
71 IBOutlet NSButton* pageButton_; 70 IBOutlet NSButton* pageButton_;
72 IBOutlet NSButton* wrenchButton_; 71 IBOutlet NSButton* wrenchButton_;
73 IBOutlet NSTextField* locationBar_; 72 IBOutlet NSTextField* locationBar_;
74 IBOutlet BookmarkBarView* bookmarkBarView_;
75 } 73 }
76 74
77 // Initialize the toolbar and register for command updates. The profile is 75 // Initialize the toolbar and register for command updates. The profile is
78 // needed for initializing the location bar. 76 // needed for initializing the location bar.
79 - (id)initWithModel:(ToolbarModel*)model 77 - (id)initWithModel:(ToolbarModel*)model
80 commands:(CommandUpdater*)commands 78 commands:(CommandUpdater*)commands
81 profile:(Profile*)profile 79 profile:(Profile*)profile
82 webContentView:(NSView*)webContentView 80 webContentView:(NSView*)webContentView
83 bookmarkDelegate:(id<BookmarkURLOpener>)delegate; 81 bookmarkDelegate:(id<BookmarkURLOpener>)delegate;
84 82
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 118
121 // A set of private methods used by tests, in the absence of "friends" in ObjC. 119 // A set of private methods used by tests, in the absence of "friends" in ObjC.
122 @interface ToolbarController(PrivateTestMethods) 120 @interface ToolbarController(PrivateTestMethods)
123 // Returns an array of views in the order of the outlets above. 121 // Returns an array of views in the order of the outlets above.
124 - (NSArray*)toolbarViews; 122 - (NSArray*)toolbarViews;
125 - (void)showOptionalHomeButton; 123 - (void)showOptionalHomeButton;
126 - (void)showOptionalPageWrenchButtons; 124 - (void)showOptionalPageWrenchButtons;
127 @end 125 @end
128 126
129 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ 127 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/tab_window_controller.mm ('k') | chrome/browser/cocoa/toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698