mac: Major fullscreen refactor.

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 337 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) {
-  // When simplified fullscreen is enabled, always enter normal fullscreen.
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kEnableSimplifiedFullscreen)) {
-    if (url.is_empty())
-      [controller_ enterFullscreen];
-    else
-      [controller_ enterFullscreenForURL:url bubbleType:bubble_type];
-    return;
-  }
-
-  [controller_ enterPresentationModeForURL:url
-                                bubbleType:bubble_type];
+  [controller_ enterGenericFullscreenForURL:url bubbleType:bubble_type];
 }
 
 void BrowserWindowCocoa::ExitFullscreen() {
-  [controller_ exitFullscreen];
+  [controller_ exitGenericFullscreen];
 }
 
 void BrowserWindowCocoa::UpdateFullscreenExitBubbleContent(
       const GURL& url,
       FullscreenExitBubbleType bubble_type) {
   [controller_ updateFullscreenExitBubbleURL:url bubbleType:bubble_type];
 }
 
 bool BrowserWindowCocoa::ShouldHideUIForFullscreen() const {
   // On Mac, fullscreen mode has most normal things (in a slide-down panel).
   return false;
 }
 
 bool BrowserWindowCocoa::IsFullscreen() const {
-  if ([controller_ inPresentationMode])
-    CHECK([controller_ isFullscreen]);  // Presentation mode must be fullscreen.
-  return [controller_ isFullscreen];
+  return [controller_ isInOrEnteringAnyFullscreenMode];
 }
 
 bool BrowserWindowCocoa::IsFullscreenBubbleVisible() const {
   return false;
 }
 
 void BrowserWindowCocoa::ConfirmAddSearchProvider(
     TemplateURL* template_url,
     Profile* profile) {
   // The controller will release itself when the window closes.
@@ skipping 215 matching lines @@
 void BrowserWindowCocoa::Paste() {
   [NSApp sendAction:@selector(paste:) to:nil from:nil];
 }
 
 void BrowserWindowCocoa::EnterFullscreenWithChrome() {
   // This method cannot be called if simplified fullscreen is enabled.
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   DCHECK(!command_line->HasSwitch(switches::kEnableSimplifiedFullscreen));
 
   CHECK(chrome::mac::SupportsSystemFullscreen());
-  if ([controller_ inPresentationMode])
-    [controller_ exitPresentationMode];
-  else
-    [controller_ enterFullscreen];
+  [controller_ enterFullscreenWithChrome];
 }
 
 bool BrowserWindowCocoa::IsFullscreenWithChrome() {
   // The WithChrome mode does not exist when simplified fullscreen is enabled.
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableSimplifiedFullscreen))
     return false;
   return IsFullscreen() && ![controller_ inPresentationMode];
 }
 
 bool BrowserWindowCocoa::IsFullscreenWithoutChrome() {
   // Presentation mode does not exist if simplified fullscreen is enabled.  The
   // WithoutChrome mode simply maps to whether or not the window is fullscreen.
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableSimplifiedFullscreen))
     return IsFullscreen();
 
   return IsFullscreen() && [controller_ inPresentationMode];
 }
 
 WindowOpenDisposition BrowserWindowCocoa::GetDispositionForPopupBounds(
     const gfx::Rect& bounds) {
   // When using Cocoa's System Fullscreen mode, convert popups into tabs.
-  if ([controller_ isInSystemFullscreen])
+  if ([controller_ isInOrEnteringAppKitFullscreen])
     return NEW_FOREGROUND_TAB;
   return NEW_POPUP;
 }
 
 FindBar* BrowserWindowCocoa::CreateFindBar() {
   // We could push the AddFindBar() call into the FindBarBridge
   // constructor or the FindBarCocoaController init, but that makes
   // unit testing difficult, since we would also require a
   // BrowserWindow object.
   FindBarBridge* bridge = new FindBarBridge(browser_);
@@ skipping 94 matching lines @@
 
 void BrowserWindowCocoa::ShowPageActionPopup(
     const extensions::Extension* extension) {
   [cocoa_controller() activatePageAction:extension->id()];
 }
 
 void BrowserWindowCocoa::ShowBrowserActionPopup(
     const extensions::Extension* extension) {
   [cocoa_controller() activateBrowserAction:extension->id()];
 }