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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller.h

Issue 2491343003: [Mac] Fix for fullscreen toolbar layout issues (Closed)
Patch Set: Fix for avi Created 4 years, 1 month 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_BROWSER_WINDOW_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
7 7
8 // A class acting as the Objective-C controller for the Browser 8 // A class acting as the Objective-C controller for the Browser
9 // object. Handles interactions between Cocoa and the cross-platform 9 // object. Handles interactions between Cocoa and the cross-platform
10 // code. Each window has a single toolbar and, by virtue of being a 10 // code. Each window has a single toolbar and, by virtue of being a
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 // used, the multi-profile button can either be the avatar's icon badge or a 124 // used, the multi-profile button can either be the avatar's icon badge or a
125 // button with the profile's name. If the flag is used, the button is always 125 // button with the profile's name. If the flag is used, the button is always
126 // shown, otherwise the view will always be in the view hierarchy but will 126 // shown, otherwise the view will always be in the view hierarchy but will
127 // be hidden unless it's appropriate to show it (i.e. if there's more than 127 // be hidden unless it's appropriate to show it (i.e. if there's more than
128 // one profile). 128 // one profile).
129 base::scoped_nsobject<AvatarBaseController> avatarButtonController_; 129 base::scoped_nsobject<AvatarBaseController> avatarButtonController_;
130 130
131 // Lazily created view which draws the background for the floating set of bars 131 // Lazily created view which draws the background for the floating set of bars
132 // in presentation mode (for window types having a floating bar; it remains 132 // in presentation mode (for window types having a floating bar; it remains
133 // nil for those which don't). 133 // nil for those which don't).
134 // TODO(spqchan): Rename this to "fullscreenToolbarBackingView"
134 base::scoped_nsobject<NSView> floatingBarBackingView_; 135 base::scoped_nsobject<NSView> floatingBarBackingView_;
135 136
136 // The borderless window used in fullscreen mode when Cocoa's System 137 // The borderless window used in fullscreen mode when Cocoa's System
137 // Fullscreen API is not being used (or not available, before OS 10.7). 138 // Fullscreen API is not being used (or not available, before OS 10.7).
138 base::scoped_nsobject<NSWindow> fullscreenWindow_; 139 base::scoped_nsobject<NSWindow> fullscreenWindow_;
139 140
140 // True between |-windowWillEnterFullScreen:| and |-windowDidEnterFullScreen:| 141 // True between |-windowWillEnterFullScreen:| and |-windowDidEnterFullScreen:|
141 // to indicate that the window is in the process of transitioning into 142 // to indicate that the window is in the process of transitioning into
142 // AppKit fullscreen mode. 143 // AppKit fullscreen mode.
143 BOOL enteringAppKitFullscreen_; 144 BOOL enteringAppKitFullscreen_;
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 // Returns the fullscreen toolbar controller. 603 // Returns the fullscreen toolbar controller.
603 - (FullscreenToolbarController*)fullscreenToolbarController; 604 - (FullscreenToolbarController*)fullscreenToolbarController;
604 605
605 // Sets the fullscreen toolbar controller. 606 // Sets the fullscreen toolbar controller.
606 - (void)setFullscreenToolbarController:(FullscreenToolbarController*)controller; 607 - (void)setFullscreenToolbarController:(FullscreenToolbarController*)controller;
607 608
608 @end // @interface BrowserWindowController (TestingAPI) 609 @end // @interface BrowserWindowController (TestingAPI)
609 610
610 611
611 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 612 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698