Disabled custom fullscreen animation for entering tab fullscreen since currently it breaks Flash co…

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>
 
 #import "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 435 matching lines @@
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   [center removeObserver:self
                     name:NSWindowWillCloseNotification
                   object:[notification object]];
   [self releaseBarVisibilityForOwner:[notification object]
                        withAnimation:YES
                                delay:YES];
 }
 
 - (void)configurePresentationModeController {
-  BOOL fullscreen_for_tab = browser_->exclusive_access_manager()
-                                ->fullscreen_controller()
-                                ->IsWindowFullscreenForTabOrPending();
-  BOOL kiosk_mode =
+  BOOL fullscreenForTab = [self isFullscreenForTabContent];
+  BOOL kioskMode =
       base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
   BOOL showDropdown =
-      !fullscreen_for_tab && !kiosk_mode && ([self floatingBarHasFocus]);
+      !fullscreenForTab && !kioskMode && ([self floatingBarHasFocus]);
 
   PermissionBubbleManager* manager = [self permissionBubbleManager];
   if (manager && manager->IsBubbleVisible()) {
     NSWindow* bubbleWindow = manager->GetBubbleWindow();
     DCHECK(bubbleWindow);
     // A visible permission bubble will force the dropdown to remain
     // visible.
     [self lockBarVisibilityForOwner:bubbleWindow withAnimation:NO delay:NO];
     showDropdown = YES;
     // Register to be notified when the permission bubble is closed, to
@@ skipping 235 matching lines @@
   if (isUsingCustomAnimation_)
     blockLayoutSubviews_ = YES;
   else
     [self adjustUIForEnteringFullscreen];
 }
 
 - (void)windowDidEnterFullScreen:(NSNotification*)notification {
   blockLayoutSubviews_ = NO;
   fullscreenTransition_.reset();
 
+  if ([self isFullscreenForTabContent]) {
+     NSRect windowFrame = [self window].frame;
+     NSRect contentViewFrame =
+        NSMakeRect(0, 0, windowFrame.size.width, windowFrame.size.height);
+     [self.chromeContentView setFrame:contentViewFrame];
+  }
+
   // In Yosemite, some combination of the titlebar and toolbar always show in
   // full-screen mode. We do not want either to show. Search for the window that
   // contains the views, and hide it. There is no need to ever unhide the view.
   // http://crbug.com/380235
   if (base::mac::IsOSYosemiteOrLater()) {
     for (NSWindow* window in [[NSApplication sharedApplication] windows]) {
       if ([window
               isKindOfClass:NSClassFromString(@"NSToolbarFullScreenWindow")]) {
         // Hide the toolbar if it is for a FramedBrowserWindow.
         if ([window respondsToSelector:@selector(_windowForToolbar)]) {
@@ skipping 120 matching lines @@
     [sheetController unhideSheetForFullscreenTransition];
 }
 
 - (void)adjustUIForExitingFullscreen {
   [self destroyFullscreenExitBubbleIfNecessary];
   [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
 }
 
 - (void)adjustUIForEnteringFullscreen {
   fullscreen_mac::SlidingStyle style;
-  if (browser_->exclusive_access_manager()
-          ->fullscreen_controller()
-          ->IsWindowFullscreenForTabOrPending()) {
+  if ([self isFullscreenForTabContent]) {
     style = fullscreen_mac::OMNIBOX_TABS_NONE;
   } else if (enteringPresentationMode_) {
     style = fullscreen_mac::OMNIBOX_TABS_HIDDEN;
   } else {
     style = fullscreen_mac::OMNIBOX_TABS_PRESENT;
   }
 
   [self adjustUIForSlidingFullscreenStyle:style];
 }
 
@@ skipping 289 matching lines @@
 - (BOOL)shouldUseCustomAppKitFullscreenTransition:(BOOL)enterFullScreen {
   // Custom fullscreen transitions should only be available in OSX 10.10+.
   if (base::mac::IsOSMountainLionOrEarlier())
     return NO;
 
   // Disable the custom exit animation in OSX 10.9:
   // https://code.google.com/p/chromium/issues/detail?id=526327#c3.
   if (base::mac::IsOSMavericks() && !enterFullScreen)
     return NO;
 
+  // Temporary disable custom enter animation since it currently breaks the
+  // fullscreen Flash content.
+  // TODO(spqchan): Fix the custom animation to enter fullscreen so that it
+  // will work with Flash content.
+  if (enterFullScreen && [self isFullscreenForTabContent])
+    return NO;
+
   NSView* root = [[self.window contentView] superview];
   if (!root.layer)
     return NO;
 
   // AppKit on OSX 10.9 has a bug for applications linked against OSX 10.8 SDK
   // and earlier. Under specific circumstances, it prevents the custom AppKit
   // transition from working well. See http://crbug.com/396980 for more
   // details.
   if ([[self class] systemSettingsRequireMavericksAppKitFullscreenHack] &&
       ![[[self window] screen] isEqual:[[NSScreen screens] firstObject]]) {
@@ skipping 68 matching lines @@
 - (WebContents*)webContents {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 - (PermissionBubbleManager*)permissionBubbleManager {
   if (WebContents* contents = [self webContents])
     return PermissionBubbleManager::FromWebContents(contents);
   return nil;
 }
 
+- (BOOL)isFullscreenForTabContent {
+  return browser_->exclusive_access_manager()
+                 ->fullscreen_controller()
+                 ->IsWindowFullscreenForTabOrPending();
+}
+
 @end  // @implementation BrowserWindowController(Private)