summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/browser_window_controller_private.mm
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 20:25:33 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-22 20:25:33 +0000
commit730e827735c0e472753a6bfef8757406eb0cbd47 (patch)
tree80d0ddd42940efb499dc0835bd855a373eecf4a5 /chrome/browser/cocoa/browser_window_controller_private.mm
parentb9f11fa51c05d4c9630644925253815da1fb89a2 (diff)
downloadchromium_src-730e827735c0e472753a6bfef8757406eb0cbd47.zip
chromium_src-730e827735c0e472753a6bfef8757406eb0cbd47.tar.gz
chromium_src-730e827735c0e472753a6bfef8757406eb0cbd47.tar.bz2
[Mac] Request/Release the fullscreen lock whenever a window gains or loses main status.
BUG=35973 TEST=Fullscreen one window, then Cmd-N to open a new window. Menubar should be visible. Review URL: http://codereview.chromium.org/628006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/browser_window_controller_private.mm')
-rw-r--r--chrome/browser/cocoa/browser_window_controller_private.mm17
1 files changed, 7 insertions, 10 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller_private.mm b/chrome/browser/cocoa/browser_window_controller_private.mm
index 4b1ddd8..6cb72e8 100644
--- a/chrome/browser/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/cocoa/browser_window_controller_private.mm
@@ -423,17 +423,14 @@ willPositionSheet:(NSWindow*)sheet
[self layoutSubviews];
}
+// TODO(rohitrao): This function has shrunk into uselessness, and
+// |-setFullscreen:| has grown rather large. Find a good way to break up
+// |-setFullscreen:| into smaller pieces. http://crbug.com/36449
- (void)adjustUIForFullscreen:(BOOL)fullscreen {
- if (fullscreen) {
- mac_util::RequestFullScreen();
-
- // Create the floating bar backing view if necessary.
- if (!floatingBarBackingView_.get()) {
- floatingBarBackingView_.reset(
- [[FloatingBarBackingView alloc] initWithFrame:NSZeroRect]);
- }
- } else {
- mac_util::ReleaseFullScreen();
+ // Create the floating bar backing view if necessary.
+ if (fullscreen && !floatingBarBackingView_.get()) {
+ floatingBarBackingView_.reset(
+ [[FloatingBarBackingView alloc] initWithFrame:NSZeroRect]);
}
}