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

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

Issue 12763002: Move CrTrackingArea from chrome/browser/ui/cocoa to ui/base/cocoa. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test in namespace Created 7 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/memory/scoped_nsobject.h" 10 #include "base/memory/scoped_nsobject.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/prefs/public/pref_member.h" 12 #include "base/prefs/public/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/tracking_area.h"
15 #import "chrome/browser/ui/cocoa/url_drop_target.h" 14 #import "chrome/browser/ui/cocoa/url_drop_target.h"
16 #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"
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 BrowserActionsController; 23 @class BrowserActionsController;
24 class CommandUpdater; 24 class CommandUpdater;
25 class LocationBarViewMac; 25 class LocationBarViewMac;
26 @class MenuButton; 26 @class MenuButton;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 BooleanPrefMember showHomeButton_; 78 BooleanPrefMember showHomeButton_;
79 BOOL hasToolbar_; // If NO, we may have only the location bar. 79 BOOL hasToolbar_; // If NO, we may have only the location bar.
80 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES. 80 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES.
81 BOOL locationBarAtMinSize_; // If the location bar is at the minimum size. 81 BOOL locationBarAtMinSize_; // If the location bar is at the minimum size.
82 82
83 // We have an extra retain in the locationBar_. 83 // We have an extra retain in the locationBar_.
84 // See comments in awakeFromNib for more info. 84 // See comments in awakeFromNib for more info.
85 scoped_nsobject<AutocompleteTextField> locationBarRetainer_; 85 scoped_nsobject<AutocompleteTextField> locationBarRetainer_;
86 86
87 // Tracking area for mouse enter/exit/moved in the toolbar. 87 // Tracking area for mouse enter/exit/moved in the toolbar.
88 ScopedCrTrackingArea trackingArea_; 88 ui::ScopedCrTrackingArea trackingArea_;
89 89
90 // We retain/release the hover button since interaction with the 90 // We retain/release the hover button since interaction with the
91 // button may make it go away (e.g. delete menu option over a 91 // button may make it go away (e.g. delete menu option over a
92 // bookmark button). Thus this variable is not weak. The 92 // bookmark button). Thus this variable is not weak. The
93 // hoveredButton_ is required to have an NSCell that responds to 93 // hoveredButton_ is required to have an NSCell that responds to
94 // setMouseInside:animate:. 94 // setMouseInside:animate:.
95 NSButton* hoveredButton_; 95 NSButton* hoveredButton_;
96 } 96 }
97 97
98 // Initialize the toolbar and register for command updates. The profile is 98 // Initialize the toolbar and register for command updates. The profile is
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 // Returns an array of views in the order of the outlets above. 182 // Returns an array of views in the order of the outlets above.
183 - (NSArray*)toolbarViews; 183 - (NSArray*)toolbarViews;
184 - (void)showOptionalHomeButton; 184 - (void)showOptionalHomeButton;
185 - (void)installWrenchMenu; 185 - (void)installWrenchMenu;
186 - (WrenchMenuController*)wrenchMenuController; 186 - (WrenchMenuController*)wrenchMenuController;
187 // Return a hover button for the current event. 187 // Return a hover button for the current event.
188 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent; 188 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
189 @end 189 @end
190 190
191 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_ 191 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/cocoa/tracking_area.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698