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

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

Issue 501135: Revert 34998, more stabbing in the dark to find a perf regression - Mac: impl... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years 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
« no previous file with comments | « chrome/browser/cocoa/tab_strip_view.mm ('k') | chrome/browser/cocoa/toolbar_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/delayedmenu_button.h" 13 #import "chrome/browser/cocoa/delayedmenu_button.h"
14 #import "chrome/browser/cocoa/url_drop_target.h"
15 #import "chrome/browser/cocoa/view_resizer.h" 14 #import "chrome/browser/cocoa/view_resizer.h"
16 #include "chrome/common/pref_member.h" 15 #include "chrome/common/pref_member.h"
17 16
18 class AppMenuModel; 17 class AppMenuModel;
19 @class AutocompleteTextField; 18 @class AutocompleteTextField;
20 @class AutocompleteTextFieldEditor; 19 @class AutocompleteTextFieldEditor;
21 @class BackForwardMenuController; 20 @class BackForwardMenuController;
22 class Browser; 21 class Browser;
23 @class BrowserActionsController; 22 @class BrowserActionsController;
24 class BubblePositioner; 23 class BubblePositioner;
(...skipping 10 matching lines...) Expand all
35 } 34 }
36 class Profile; 35 class Profile;
37 class TabContents; 36 class TabContents;
38 class ToolbarModel; 37 class ToolbarModel;
39 38
40 // A controller for the toolbar in the browser window. Manages 39 // A controller for the toolbar in the browser window. Manages
41 // updating the state for location bar and back/fwd/reload/go buttons. 40 // updating the state for location bar and back/fwd/reload/go buttons.
42 // Manages the bookmark bar and its position in the window relative to 41 // Manages the bookmark bar and its position in the window relative to
43 // the web content view. 42 // the web content view.
44 43
45 @interface ToolbarController : NSViewController<CommandObserverProtocol, 44 @interface ToolbarController :
46 URLDropTargetController> { 45 NSViewController<CommandObserverProtocol> {
47 @private 46 @private
48 ToolbarModel* toolbarModel_; // weak, one per window 47 ToolbarModel* toolbarModel_; // weak, one per window
49 CommandUpdater* commands_; // weak, one per window 48 CommandUpdater* commands_; // weak, one per window
50 Profile* profile_; // weak, one per window 49 Profile* profile_; // weak, one per window
51 Browser* browser_; // weak, one per window 50 Browser* browser_; // weak, one per window
52 scoped_ptr<CommandObserverBridge> commandObserver_; 51 scoped_ptr<CommandObserverBridge> commandObserver_;
53 scoped_ptr<LocationBarViewMac> locationBarView_; 52 scoped_ptr<LocationBarViewMac> locationBarView_;
54 scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_; 53 scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_;
55 id<ViewResizer> resizeDelegate_; // weak 54 id<ViewResizer> resizeDelegate_; // weak
56 scoped_nsobject<BackForwardMenuController> backMenuController_; 55 scoped_nsobject<BackForwardMenuController> backMenuController_;
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 - (NSArray*)toolbarViews; 163 - (NSArray*)toolbarViews;
165 - (void)showOptionalHomeButton; 164 - (void)showOptionalHomeButton;
166 - (void)showOptionalPageWrenchButtons; 165 - (void)showOptionalPageWrenchButtons;
167 - (gfx::Rect)locationStackBounds; 166 - (gfx::Rect)locationStackBounds;
168 // Return a hover button for the current event. 167 // Return a hover button for the current event.
169 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent; 168 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
170 - (BrowserActionsController*)browserActionsController; 169 - (BrowserActionsController*)browserActionsController;
171 @end 170 @end
172 171
173 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_ 172 #endif // CHROME_BROWSER_COCOA_TOOLBAR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/cocoa/tab_strip_view.mm ('k') | chrome/browser/cocoa/toolbar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698