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

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

Issue 2629723005: [Mac] Fix bugs in resizing the browser actions area next to the omnibox. (Closed)
Patch Set: Format Created 3 years, 11 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 <memory> 10 #include <memory>
11 11
12 #include "base/mac/scoped_nsobject.h" 12 #include "base/mac/scoped_nsobject.h"
13 #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h" 13 #import "chrome/browser/ui/cocoa/has_weak_browser_pointer.h"
14 #import "chrome/browser/ui/cocoa/url_drop_target.h" 14 #import "chrome/browser/ui/cocoa/url_drop_target.h"
15 #import "chrome/browser/ui/cocoa/view_resizer.h" 15 #import "chrome/browser/ui/cocoa/view_resizer.h"
16 #include "components/prefs/pref_member.h" 16 #include "components/prefs/pref_member.h"
17 #import "ui/base/cocoa/tracking_area.h" 17 #import "ui/base/cocoa/tracking_area.h"
18 18
19 @class AutocompleteTextField; 19 @class AutocompleteTextField;
20 @class AutocompleteTextFieldEditor; 20 @class AutocompleteTextFieldEditor;
21 @class BackForwardMenuController; 21 @class BackForwardMenuController;
22 class Browser; 22 class Browser;
23 @class BrowserActionsContainerView; 23 @class BrowserActionsContainerView;
24 class BrowserActionsContainerViewSizeDelegate;
25 @class BrowserActionsController; 24 @class BrowserActionsController;
26 class CommandUpdater; 25 class CommandUpdater;
27 class LocationBarViewMac; 26 class LocationBarViewMac;
28 @class MenuButton; 27 @class MenuButton;
29 class Profile; 28 class Profile;
30 @class ReloadButton; 29 @class ReloadButton;
31 @class ToolbarButton; 30 @class ToolbarButton;
32 @class AppMenuController; 31 @class AppMenuController;
33 32
34 namespace content { 33 namespace content {
(...skipping 29 matching lines...) Expand all
64 Profile* profile_; // weak, one per window 63 Profile* profile_; // weak, one per window
65 Browser* browser_; // weak, one per window 64 Browser* browser_; // weak, one per window
66 std::unique_ptr<ToolbarControllerInternal::CommandObserverBridge> 65 std::unique_ptr<ToolbarControllerInternal::CommandObserverBridge>
67 commandObserver_; 66 commandObserver_;
68 std::unique_ptr<LocationBarViewMac> locationBarView_; 67 std::unique_ptr<LocationBarViewMac> locationBarView_;
69 base::scoped_nsobject<AutocompleteTextFieldEditor> 68 base::scoped_nsobject<AutocompleteTextFieldEditor>
70 autocompleteTextFieldEditor_; 69 autocompleteTextFieldEditor_;
71 base::scoped_nsobject<BackForwardMenuController> backMenuController_; 70 base::scoped_nsobject<BackForwardMenuController> backMenuController_;
72 base::scoped_nsobject<BackForwardMenuController> forwardMenuController_; 71 base::scoped_nsobject<BackForwardMenuController> forwardMenuController_;
73 base::scoped_nsobject<BrowserActionsController> browserActionsController_; 72 base::scoped_nsobject<BrowserActionsController> browserActionsController_;
74 std::unique_ptr<BrowserActionsContainerViewSizeDelegate>
75 browserActionsContainerDelegate_;
76 73
77 // Lazily-instantiated menu controller. 74 // Lazily-instantiated menu controller.
78 base::scoped_nsobject<AppMenuController> appMenuController_; 75 base::scoped_nsobject<AppMenuController> appMenuController_;
79 76
80 // Used for monitoring the optional toolbar button prefs. 77 // Used for monitoring the optional toolbar button prefs.
81 std::unique_ptr<ToolbarControllerInternal::NotificationBridge> 78 std::unique_ptr<ToolbarControllerInternal::NotificationBridge>
82 notificationBridge_; 79 notificationBridge_;
83 BooleanPrefMember showHomeButton_; 80 BooleanPrefMember showHomeButton_;
84 BOOL hasToolbar_; // If NO, we may have only the location bar. 81 BOOL hasToolbar_; // If NO, we may have only the location bar.
85 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES. 82 BOOL hasLocationBar_; // If |hasToolbar_| is YES, this must also be YES.
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 - (void)installAppMenu; 200 - (void)installAppMenu;
204 // Return a hover button for the current event. 201 // Return a hover button for the current event.
205 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent; 202 - (NSButton*)hoverButtonForEvent:(NSEvent*)theEvent;
206 // Adjusts browser actions container view in response to toolbar frame changes. 203 // Adjusts browser actions container view in response to toolbar frame changes.
207 // Outside of tests, called in response to frame changed/new window 204 // Outside of tests, called in response to frame changed/new window
208 // notifications. 205 // notifications.
209 - (void)toolbarFrameChanged; 206 - (void)toolbarFrameChanged;
210 @end 207 @end
211 208
212 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_ 209 #endif // CHROME_BROWSER_UI_COCOA_TOOLBAR_TOOLBAR_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698