mac: Fix bug where exiting tab fullscreen would cause Chrome menubar to disappear.

chrome/browser/ui/cocoa/browser_window_controller_private.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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
@@ skipping 472 matching lines @@
 - (void)adjustUIForExitingFullscreenAndStopOmniboxSliding {
   [presentationModeController_ exitPresentationMode];
   presentationModeController_.reset();
 
   // Force the bookmark bar z-order to update.
   [[bookmarkBarController_ view] removeFromSuperview];
   [self layoutSubviews];
 }
 
 - (void)adjustUIForSlidingFullscreenStyle:(fullscreen_mac::SlidingStyle)style {
-  if (!presentationModeController_) {
-    presentationModeController_.reset(
-        [self newPresentationModeControllerWithStyle:style]);
-    [self configurePresentationModeController];
-  } else {
-    presentationModeController_.get().slidingStyle = style;
-  }
+  [presentationModeController_ exitPresentationMode];

[Robert Sesek, 2014/10/15 20:28:14]

I don't follow this...

[erikchen, 2014/10/15 21:50:35]

presentationModeController_.get().slidingStyle = style; isn't sufficient to
reset all state of the presentationModeController. That being said, it doesn't
affect the current CL, or the current functionality, so I'm dropping it from
this CL

+  presentationModeController_.reset(
+      [self newPresentationModeControllerWithStyle:style]);
+  [self configurePresentationModeController];
 
   if (!floatingBarBackingView_.get() &&
       ([self hasTabStrip] || [self hasToolbar] || [self hasLocationBar])) {
     floatingBarBackingView_.reset(
         [[FloatingBarBackingView alloc] initWithFrame:NSZeroRect]);
     [floatingBarBackingView_
         setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];
   }
 
   // Force the bookmark bar z-order to update.
@@ skipping 533 matching lines @@
 
       [CATransaction commit];
       hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = YES;
     }
   } else {
     hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = NO;
   }
 }
 
 @end  // @implementation BrowserWindowController(Private)