[MacViews] Fix behavior of non-resizable windows in fullscreen.

ui/views/cocoa/bridged_native_widget.mm

 // Copyright 2014 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 "ui/views/cocoa/bridged_native_widget.h"
 
 #import <objc/runtime.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
@@ skipping 368 matching lines @@
   in_fullscreen_transition_ = true;
 
   // If going into fullscreen, store an answer for GetRestoredBounds().
   if (target_fullscreen_state)
     bounds_before_fullscreen_ = gfx::ScreenRectFromNSRect([window_ frame]);
 }
 
 void BridgedNativeWidget::OnFullscreenTransitionComplete(
     bool actual_fullscreen_state) {
   in_fullscreen_transition_ = false;
-  if (target_fullscreen_state_ == actual_fullscreen_state)
+
+  if (target_fullscreen_state_ == actual_fullscreen_state) {
+    // Ensure constraints are re-applied when completing a transition.
+    OnSizeConstraintsChanged();
     return;
+  }
 
   // First update to reflect reality so that OnTargetFullscreenStateChanged()
   // expects the change.
   target_fullscreen_state_ = actual_fullscreen_state;
   ToggleDesiredFullscreenState();
 
   // Usually ToggleDesiredFullscreenState() sets |in_fullscreen_transition_| via
   // OnFullscreenTransitionStart(). When it does not, it means Cocoa ignored the
   // toggleFullScreen: request. This can occur when the fullscreen transition
   // fails and Cocoa is *about* to send windowDidFailToEnterFullScreen:.
@@ skipping 22 matching lines @@
   // of relying on AppKit to do it, and not worry that OnVisibilityChanged()
   // won't be called for externally triggered fullscreen requests.
   if (!window_visible_)
     SetVisibilityState(SHOW_INACTIVE);
 
   if (base::mac::IsOSSnowLeopard()) {
     NOTIMPLEMENTED();
     return;  // TODO(tapted): Implement this for Snow Leopard.
   }
 
-  // Since fullscreen requests are ignored if the collection behavior does not
-  // allow it, save the collection behavior and restore it after.
-  NSWindowCollectionBehavior behavior = [window_ collectionBehavior];
-  [window_ setCollectionBehavior:behavior |
-                                 NSWindowCollectionBehaviorFullScreenPrimary];
+  // Enable fullscreen collection behavior because:
+  // 1: -[NSWindow toggleFullscreen:] would otherwise be ignored,
+  // 2: the fullscreen button must be enabled so the user can leave fullscreen.
+  // This will be reset when a transition out of fullscreen completes.
+  gfx::SetNSWindowCanFullscreen(window_, true);
+
   [window_ toggleFullScreen:nil];
-  [window_ setCollectionBehavior:behavior];
 }
 
 void BridgedNativeWidget::OnSizeChanged() {
   gfx::Size new_size = GetClientAreaSize();
   native_widget_mac_->GetWidget()->OnNativeWidgetSizeChanged(new_size);
   if (layer())
     UpdateLayerProperties();
 }
 
 void BridgedNativeWidget::OnVisibilityChanged() {
@@ skipping 64 matching lines @@
       widget->OnNativeFocus();
       widget->GetFocusManager()->RestoreFocusedView();
     } else {
       widget->OnNativeBlur();
       widget->GetFocusManager()->StoreFocusedView(true);
     }
   }
 }
 
 void BridgedNativeWidget::OnSizeConstraintsChanged() {
-  NSWindow* window = ns_window();
+  // Don't modify the size constraints or fullscreen collection behavior while
+  // in fullscreen or during a transition. OnFullscreenTransitionComplete will
+  // reset these after leaving fullscreen.
+  if (target_fullscreen_state_ || in_fullscreen_transition_)
+    return;
+
   Widget* widget = native_widget_mac()->GetWidget();
   gfx::Size min_size = widget->GetMinimumSize();
   gfx::Size max_size = widget->GetMaximumSize();
   bool is_resizable = widget->widget_delegate()->CanResize();
   bool shows_resize_controls =
       is_resizable && (min_size.IsEmpty() || min_size != max_size);
   bool shows_fullscreen_controls =
       is_resizable && widget->widget_delegate()->CanMaximize();
 
-  gfx::ApplyNSWindowSizeConstraints(window, min_size, max_size,
+  gfx::ApplyNSWindowSizeConstraints(window_, min_size, max_size,
                                     shows_resize_controls,
                                     shows_fullscreen_controls);
 }
 
 InputMethod* BridgedNativeWidget::CreateInputMethod() {
   if (switches::IsTextInputFocusManagerEnabled())
     return new NullInputMethod();
 
   return new InputMethodBridge(this, GetHostInputMethod(), true);
 }
@@ skipping 287 matching lines @@
       window_, &kWindowPropertiesKey);
   if (!properties) {
     properties = [NSMutableDictionary dictionary];
     objc_setAssociatedObject(window_, &kWindowPropertiesKey,
                              properties, OBJC_ASSOCIATION_RETAIN);
   }
   return properties;
 }
 
 }  // namespace views