Upstream version 11.39.250.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / browser_window_controller.mm

diff --git a/src/chrome/browser/ui/cocoa/browser_window_controller.mm b/src/chrome/browser/ui/cocoa/browser_window_controller.mm
index f08833a..74e85fb 100644 (file)
--- a/src/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/src/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -45,7 +45,6 @@
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
-#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h"
@@ -1974,9 +1973,6 @@ using content::WebContents;
   [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]];
   [self adjustToolbarAndBookmarkBarForCompression:
           [controller getDesiredToolbarHeightCompression]];
-
-  [[ConstrainedWindowSheetController controllerForParentWindow:[self window]]
-      updateSheetPosition];
 }
 
 // (Needed for |BookmarkBarControllerDelegate| protocol.)
@@ -2099,6 +2095,8 @@ willAnimateFromState:(BookmarkBar::State)oldState
 
 - (void)enterPresentationMode {
   if (!chrome::mac::SupportsSystemFullscreen()) {
+    if ([self isInImmersiveFullscreen])
+      return;
     [self enterImmersiveFullscreen];
     return;
   }