Refactor BrowserWindow fullscreen and presentation on Mac to be consistent with other platforms.

chrome/browser/ui/cocoa/browser_window_cocoa.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
@@ skipping 318 matching lines @@
 
 void BrowserWindowCocoa::Restore() {
   if (IsMaximized())
     [window() zoom:controller_];  // Toggles zoom mode.
   else if (IsMinimized())
     [window() deminiaturize:controller_];
 }
 
 void BrowserWindowCocoa::EnterFullscreen(
       const GURL& url, FullscreenExitBubbleType bubble_type) {
-  [controller_ enterFullscreenForURL:url
-                          bubbleType:bubble_type];
+  [controller_ enterPresentationModeForURL:url

[Robert Sesek, 2013/01/18 19:41:35]

Why is this switching to enterPresentationMode? Shouldn't this map to
enterFullscreen so it does Lion fullscreen on 10.7+ and presentation mode/the
only FS mode on 10.6?

[scheib, 2013/01/18 22:12:33]

The goal is that 'EnterFullscreen' goes to a fullscreen without chrome on all
platforms. To enter Lion fullscreen in this change use
EnterFullscreenWithChrome. (on 10.6 and earlier EnterFullscreen and
EnterFullscreenWithChrome will both only enter a fullscreen state without
chrome. (I'll add more detail to the comments in browser_window.h))

[Robert Sesek, 2013/01/18 22:19:12]

Got it and SGTM.

This may need a change in BrowserCommandController, since I believe the current
Lion fullscreen method hooks up through EnterFullscreen.

On 10.6 EnterFullscreen should call WithoutChrome and EnterFullscreenWithChrome
should assert.

+                                bubbleType:bubble_type];
 }
 
 void BrowserWindowCocoa::ExitFullscreen() {
   [controller_ exitFullscreen];
 }
 
 void BrowserWindowCocoa::UpdateFullscreenExitBubbleContent(
       const GURL& url,
       FullscreenExitBubbleType bubble_type) {
   [controller_ updateFullscreenExitBubbleURL:url bubbleType:bubble_type];
 }
 
 bool BrowserWindowCocoa::IsFullscreen() const {
+  if ([controller_ inPresentationMode])
+    CHECK([controller_ isFullscreen]);  // Presentation mode must be fullscreen.
   return [controller_ isFullscreen];
 }
 
 bool BrowserWindowCocoa::IsFullscreenBubbleVisible() const {
   return false;
 }
 
 void BrowserWindowCocoa::ConfirmAddSearchProvider(
     TemplateURL* template_url,
     Profile* profile) {
@@ skipping 220 matching lines @@
 }
 
 void BrowserWindowCocoa::Paste() {
   [NSApp sendAction:@selector(paste:) to:nil from:nil];
 }
 
 void BrowserWindowCocoa::OpenTabpose() {
   [controller_ openTabpose];
 }
 
-void BrowserWindowCocoa::EnterPresentationMode(
+void BrowserWindowCocoa::EnterFullscreenWithChrome(
       const GURL& url,

[Robert Sesek, 2013/01/18 19:41:35]

Can this URL ever be non-empty? I don't think a web page should be able to enter
the chromed fullscreen mode. Maybe worth a DCHECK or remove the param.

[scheib, 2013/01/23 18:13:37]

Done.

       FullscreenExitBubbleType bubble_type) {
-  [controller_ enterPresentationModeForURL:url
-                                bubbleType:bubble_type];
+  if ([controller_ inPresentationMode])
+    [controller_ exitPresentationMode];
+  else
+    [controller_ enterFullscreenForURL:url
+                            bubbleType:bubble_type];
 }
 
-void BrowserWindowCocoa::ExitPresentationMode() {
-  [controller_ exitPresentationMode];
+bool BrowserWindowCocoa::IsFullscreenWithChrome() {
+  return IsFullscreen() && ![controller_ inPresentationMode];
 }
 
-bool BrowserWindowCocoa::InPresentationMode() {
-  return [controller_ inPresentationMode];
+bool BrowserWindowCocoa::IsFullscreenWithoutChrome() {
+  return IsFullscreen() && [controller_ inPresentationMode];
 }
 
 gfx::Rect BrowserWindowCocoa::GetInstantBounds() {
   // Flip coordinates based on the primary screen.
   NSScreen* screen = [[NSScreen screens] objectAtIndex:0];
   NSRect monitorFrame = [screen frame];
   NSRect frame = [controller_ instantFrame];
   gfx::Rect bounds(NSRectToCGRect(frame));
   bounds.set_y(NSHeight(monitorFrame) - bounds.y() - bounds.height());
   return bounds;
@@ skipping 76 matching lines @@
   PasswordGenerationBubbleController* controller =
       [[PasswordGenerationBubbleController alloc]
         initWithWindow:browser_->window()->GetNativeWindow()
             anchoredAt:point
         renderViewHost:web_contents->GetRenderViewHost()
         passwordManager:PasswordManager::FromWebContents(web_contents)
         usingGenerator:password_generator
                forForm:form];
   [controller showWindow:nil];
 }