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

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

Issue 655393002: mac: Fix a bug where a fullscreened window on Mavericks would be too short. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 // -windowDidEnterFullScreen: gets called. 173 // -windowDidEnterFullScreen: gets called.
174 GURL fullscreenUrl_; 174 GURL fullscreenUrl_;
175 FullscreenExitBubbleType fullscreenBubbleType_; 175 FullscreenExitBubbleType fullscreenBubbleType_;
176 176
177 // The Extension Command Registry used to determine which keyboard events to 177 // The Extension Command Registry used to determine which keyboard events to
178 // handle. 178 // handle.
179 scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_; 179 scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_;
180 180
181 // Whether the root view of the window is layer backed. 181 // Whether the root view of the window is layer backed.
182 BOOL windowViewWantsLayer_; 182 BOOL windowViewWantsLayer_;
183
184 // When the window is in the process of entering AppKit Fullscreen, this
185 // property indicates whether the window is being fullscreened on the
186 // primary screen.
187 BOOL enteringAppKitFullscreenOnPrimaryScreen_;
Robert Sesek 2014/10/17 19:13:16 Move this to be after enteringPresentationMode_ in
erikchen 2014/10/17 21:02:32 Done.
183 } 188 }
184 189
185 // A convenience class method which gets the |BrowserWindowController| for a 190 // A convenience class method which gets the |BrowserWindowController| for a
186 // given window. This method returns nil if no window in the chain has a BWC. 191 // given window. This method returns nil if no window in the chain has a BWC.
187 + (BrowserWindowController*)browserWindowControllerForWindow:(NSWindow*)window; 192 + (BrowserWindowController*)browserWindowControllerForWindow:(NSWindow*)window;
188 193
189 // A convenience class method which gets the |BrowserWindowController| for a 194 // A convenience class method which gets the |BrowserWindowController| for a
190 // given view. This is the controller for the window containing |view|, if it 195 // given view. This is the controller for the window containing |view|, if it
191 // is a BWC, or the first controller in the parent-window chain that is a 196 // is a BWC, or the first controller in the parent-window chain that is a
192 // BWC. This method returns nil if no window in the chain has a BWC. 197 // BWC. This method returns nil if no window in the chain has a BWC.
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 // positioned relative to. 607 // positioned relative to.
603 - (NSRect)omniboxPopupAnchorRect; 608 - (NSRect)omniboxPopupAnchorRect;
604 609
605 // Force a layout of info bars. 610 // Force a layout of info bars.
606 - (void)layoutInfoBars; 611 - (void)layoutInfoBars;
607 612
608 @end // @interface BrowserWindowController (TestingAPI) 613 @end // @interface BrowserWindowController (TestingAPI)
609 614
610 615
611 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 616 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698