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

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 1989 matching lines @@
 
 - (void)handleLionToggleFullscreen {
   DCHECK(base::mac::IsOSLionOrLater());
   chrome::ExecuteCommand(browser_.get(), IDC_FULLSCREEN);
 }
 
 // On Lion, this method is called by either the Lion fullscreen button or the
 // "Enter Full Screen" menu item.  On Snow Leopard, this function is never
 // called by the UI directly, but it provides the implementation for
 // |-setPresentationMode:|.
-- (void)setFullscreen:(BOOL)fullscreen
-                  url:(const GURL&)url
-           bubbleType:(FullscreenExitBubbleType)bubbleType {
+- (void)setFullscreen:(BOOL)fullscreen {
   if (fullscreen == [self isFullscreen])
     return;
 
   if (!chrome::IsCommandEnabled(browser_.get(), IDC_FULLSCREEN))
     return;
 
   if (base::mac::IsOSLionOrLater()) {
     enteredPresentationModeFromFullscreen_ = YES;
     if ([[self window] isKindOfClass:[FramedBrowserWindow class]])
       [static_cast<FramedBrowserWindow*>([self window]) toggleSystemFullScreen];
   } else {
     if (fullscreen)
       [self enterFullscreenForSnowLeopard];
     else
       [self exitFullscreenForSnowLeopard];
   }
 }
 
-- (void)enterFullscreenForURL:(const GURL&)url
-                   bubbleType:(FullscreenExitBubbleType)bubbleType {
-  [self setFullscreen:YES url:url bubbleType:bubbleType];
+- (void)enterFullscreen {
+  [self setFullscreen:YES];
 }
 
 - (void)exitFullscreen {
-  // url: and bubbleType: are ignored when leaving fullscreen.
-  [self setFullscreen:NO url:GURL() bubbleType:FEB_TYPE_NONE];
+  [self setFullscreen:NO];
 }
 
 - (void)updateFullscreenExitBubbleURL:(const GURL&)url
                            bubbleType:(FullscreenExitBubbleType)bubbleType {
   fullscreenUrl_ = url;
   fullscreenBubbleType_ = bubbleType;
   [self showFullscreenExitBubbleIfNecessary];
 }
 
 - (BOOL)isFullscreen {
   return (fullscreenWindow_.get() != nil) ||
          ([[self window] styleMask] & NSFullScreenWindowMask) ||
          enteringFullscreen_;
 }
 
 // On Lion, this function is called by either the presentation mode toggle
 // button or the "Enter Presentation Mode" menu item.  In the latter case, this
 // function also triggers the Lion machinery to enter fullscreen mode as well as
 // set presentation mode.  On Snow Leopard, this function is called by the
 // "Enter Presentation Mode" menu item, and triggering presentation mode always
 // moves the user into fullscreen mode.
 - (void)setPresentationMode:(BOOL)presentationMode
                         url:(const GURL&)url
                  bubbleType:(FullscreenExitBubbleType)bubbleType {
   fullscreenUrl_ = url;
   fullscreenBubbleType_ = bubbleType;
 
   // Presentation mode on Snow Leopard maps directly to fullscreen mode.
   if (base::mac::IsOSSnowLeopard()) {
-    [self setFullscreen:presentationMode url:url bubbleType:bubbleType];
+    [self setFullscreen:presentationMode];
     return;
   }
 
   if (presentationMode) {
     BOOL fullscreen = [self isFullscreen];
     enteredPresentationModeFromFullscreen_ = fullscreen;
     enteringPresentationMode_ = YES;
 
     if (fullscreen) {
       // If already in fullscreen mode, just toggle the presentation mode
@@ skipping 165 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)