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

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

Issue 10800011: [Mac] Changes to the behavior of Lion+ fullscreen and presentation mode. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: YES Created 8 years, 5 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // The borderless window used in fullscreen mode. Lion reuses the original 122 // The borderless window used in fullscreen mode. Lion reuses the original
123 // window in fullscreen mode, so this is always nil on Lion. 123 // window in fullscreen mode, so this is always nil on Lion.
124 scoped_nsobject<NSWindow> fullscreenWindow_; 124 scoped_nsobject<NSWindow> fullscreenWindow_;
125 125
126 // Tracks whether presentation mode was entered from fullscreen mode or 126 // Tracks whether presentation mode was entered from fullscreen mode or
127 // directly from normal windowed mode. Used to determine what to do when 127 // directly from normal windowed mode. Used to determine what to do when
128 // exiting presentation mode. 128 // exiting presentation mode.
129 BOOL enteredPresentationModeFromFullscreen_; 129 BOOL enteredPresentationModeFromFullscreen_;
130 130
131 // True between -windowWillEnterFullScreen and -windowDidEnterFullScreen. 131 // True between -windowWillEnterFullScreen and -windowDidEnterFullScreen.
132 // Only used on Lion. 132 // Only used on Lion and higher.
133 BOOL enteringFullscreen_; 133 BOOL enteringFullscreen_;
134 134
135 // True between |-setPresentationMode:url:bubbleType:| and
136 // -windowDidEnterFullScreen. Only used on Lion and higher.
137 BOOL enteringPresentationMode_;
138
135 // The size of the original (non-fullscreen) window. This is saved just 139 // The size of the original (non-fullscreen) window. This is saved just
136 // before entering fullscreen mode and is only valid when |-isFullscreen| 140 // before entering fullscreen mode and is only valid when |-isFullscreen|
137 // returns YES. 141 // returns YES.
138 NSRect savedRegularWindowFrame_; 142 NSRect savedRegularWindowFrame_;
139 143
140 // The proportion of the floating bar which is shown (in presentation mode). 144 // The proportion of the floating bar which is shown (in presentation mode).
141 CGFloat floatingBarShownFraction_; 145 CGFloat floatingBarShownFraction_;
142 146
143 // Various UI elements/events may want to ensure that the floating bar is 147 // Various UI elements/events may want to ensure that the floating bar is
144 // visible (in presentation mode), e.g., because of where the mouse is or 148 // visible (in presentation mode), e.g., because of where the mouse is or
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 // |source| rect doesn't fit into |target|. 472 // |source| rect doesn't fit into |target|.
469 - (NSSize)overflowFrom:(NSRect)source 473 - (NSSize)overflowFrom:(NSRect)source
470 to:(NSRect)target; 474 to:(NSRect)target;
471 475
472 // The fullscreen exit bubble controller, or nil if the bubble isn't showing. 476 // The fullscreen exit bubble controller, or nil if the bubble isn't showing.
473 - (FullscreenExitBubbleController*)fullscreenExitBubbleController; 477 - (FullscreenExitBubbleController*)fullscreenExitBubbleController;
474 @end // @interface BrowserWindowController (TestingAPI) 478 @end // @interface BrowserWindowController (TestingAPI)
475 479
476 480
477 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_ 481 #endif // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698