Revert of [MacViews] Implement size constraints for app windows.

chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h"
 
 #include "base/command_line.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h"
 #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkRegion.h"
-#import "ui/gfx/mac/nswindow_frame_controls.h"
 #include "ui/gfx/skia_util.h"
 
 // NOTE: State Before Update.
 //
 // Internal state, such as |is_maximized_|, must be set before the window
 // state is changed so that it is accurate when e.g. a resize results in a call
 // to |OnNativeWindowChanged|.
 
 // NOTE: Maximize and Zoom.
 //
 // Zooming is implemented manually in order to implement maximize functionality
 // and to support non resizable windows. The window will be resized explicitly
 // in the |WindowWillZoom| call.
 //
 // Attempting maximize and restore functionality with non resizable windows
 // using the native zoom method did not work, even with
 // windowWillUseStandardFrame, as the window would not restore back to the
 // desired size.
 
 using extensions::AppWindow;
 
 @interface NSWindow (NSPrivateApis)
 - (void)setBottomCornerRounded:(BOOL)rounded;
 - (BOOL)_isTitleHidden;
 @end
 
 namespace {
 
+void SetFullScreenCollectionBehavior(NSWindow* window, bool allow_fullscreen) {
+  NSWindowCollectionBehavior behavior = [window collectionBehavior];
+  if (allow_fullscreen)
+    behavior |= NSWindowCollectionBehaviorFullScreenPrimary;
+  else
+    behavior &= ~NSWindowCollectionBehaviorFullScreenPrimary;
+  [window setCollectionBehavior:behavior];
+}
+
 void SetWorkspacesCollectionBehavior(NSWindow* window, bool always_visible) {
   NSWindowCollectionBehavior behavior = [window collectionBehavior];
   if (always_visible)
     behavior |= NSWindowCollectionBehaviorCanJoinAllSpaces;
   else
     behavior &= ~NSWindowCollectionBehaviorCanJoinAllSpaces;
   [window setCollectionBehavior:behavior];
 }
 
 void InitCollectionBehavior(NSWindow* window) {
@@ skipping 393 matching lines @@
   bool fullscreen = (fullscreen_types != AppWindow::FULLSCREEN_TYPE_NONE);
   if (fullscreen == is_fullscreen_)
     return;
   is_fullscreen_ = fullscreen;
 
   if (base::mac::IsOSLionOrLater()) {
     // If going fullscreen, but the window is constrained (fullscreen UI control
     // is disabled), temporarily enable it. It will be disabled again on leaving
     // fullscreen.
     if (fullscreen && !shows_fullscreen_controls_)
-      gfx::SetNSWindowCanFullscreen(window(), true);
+      SetFullScreenCollectionBehavior(window(), true);
     [window() toggleFullScreen:nil];
     return;
   }
 
   DCHECK(base::mac::IsOSSnowLeopard());
 
   // Fade to black.
   const CGDisplayReservationInterval kFadeDurationSeconds = 0.6;
   bool did_fade_out = false;
   CGDisplayFadeReservationToken token;
@@ skipping 378 matching lines @@
 
 void NativeAppWindowCocoa::WindowDidEnterFullscreen() {
   is_fullscreen_ = true;
   app_window_->OSFullscreen();
   app_window_->OnNativeWindowChanged();
 }
 
 void NativeAppWindowCocoa::WindowDidExitFullscreen() {
   is_fullscreen_ = false;
   if (!shows_fullscreen_controls_)
-    gfx::SetNSWindowCanFullscreen(window(), false);
+    SetFullScreenCollectionBehavior(window(), false);
 
   app_window_->Restore();
   app_window_->OnNativeWindowChanged();
 }
 
 void NativeAppWindowCocoa::WindowWillZoom() {
   // See top of file NOTE: Maximize and Zoom.
   if (IsMaximized())
     Restore();
   else
@@ skipping 30 matching lines @@
 gfx::Size NativeAppWindowCocoa::GetContentMaximumSize() const {
   return size_constraints_.GetMaximumSize();
 }
 
 void NativeAppWindowCocoa::SetContentSizeConstraints(
     const gfx::Size& min_size, const gfx::Size& max_size) {
   // Update the size constraints.
   size_constraints_.set_minimum_size(min_size);
   size_constraints_.set_maximum_size(max_size);
 
+  gfx::Size minimum_size = size_constraints_.GetMinimumSize();
+  [window() setContentMinSize:NSMakeSize(minimum_size.width(),
+                                         minimum_size.height())];
+
+  gfx::Size maximum_size = size_constraints_.GetMaximumSize();
+  const int kUnboundedSize = extensions::SizeConstraints::kUnboundedSize;
+  CGFloat max_width = maximum_size.width() == kUnboundedSize ?
+      CGFLOAT_MAX : maximum_size.width();
+  CGFloat max_height = maximum_size.height() == kUnboundedSize ?
+      CGFLOAT_MAX : maximum_size.height();
+  [window() setContentMaxSize:NSMakeSize(max_width, max_height)];
+
   // Update the window controls.
   shows_resize_controls_ =
       is_resizable_ && !size_constraints_.HasFixedSize();
   shows_fullscreen_controls_ =
       is_resizable_ && !size_constraints_.HasMaximumSize() && has_frame_;
 
-  gfx::ApplyNSWindowSizeConstraints(window(), min_size, max_size,
-                                    shows_resize_controls_,
-                                    shows_fullscreen_controls_);
+  if (!is_fullscreen_) {
+    [window() setStyleMask:GetWindowStyleMask()];
+
+    // Set the window to participate in Lion Fullscreen mode. Setting this flag
+    // has no effect on Snow Leopard or earlier. UI controls for fullscreen are
+    // only shown for apps that have unbounded size.
+    if (base::mac::IsOSLionOrLater())
+      SetFullScreenCollectionBehavior(window(), shows_fullscreen_controls_);
+  }
+
+  if (has_frame_) {
+    [window() setShowsResizeIndicator:shows_resize_controls_];
+    [[window() standardWindowButton:NSWindowZoomButton]
+        setEnabled:shows_fullscreen_controls_];
+  }
 }
 
 void NativeAppWindowCocoa::SetAlwaysOnTop(bool always_on_top) {
   [window() setLevel:(always_on_top ? AlwaysOnTopWindowLevel() :
                                       NSNormalWindowLevel)];
 }
 
 void NativeAppWindowCocoa::SetVisibleOnAllWorkspaces(bool always_visible) {
   SetWorkspacesCollectionBehavior(window(), always_visible);
 }
@@ skipping 17 matching lines @@
 }
 
 void NativeAppWindowCocoa::UpdateRestoredBounds() {
   if (IsRestored(*this))
     restored_bounds_ = [window() frame];
 }
 
 void NativeAppWindowCocoa::HideWithoutMarkingHidden() {
   [window() orderOut:window_controller_];
 }