Revert of Ignoring minimum size requirements for maximized windows, full screen windows and too small screens

ash/wm/window_state.cc

 // 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 "ash/wm/window_state.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/default_state.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_delegate.h"
 #include "ash/wm/window_state_observer.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 namespace wm {
 
 namespace {
 
 // A tentative class to set the bounds on the window.
 // TODO(oshima): Once all logic is cleaned up, move this to the real layout
 // manager with proper friendship.
@@ skipping 313 matching lines @@
                     OnPreWindowStateTypeChange(this, old_window_state_type));
 }
 
 void WindowState::NotifyPostStateTypeChange(
     WindowStateType old_window_state_type) {
   FOR_EACH_OBSERVER(WindowStateObserver, observer_list_,
                     OnPostWindowStateTypeChange(this, old_window_state_type));
 }
 
 void WindowState::SetBoundsDirect(const gfx::Rect& bounds) {
-  gfx::Rect actual_new_bounds(bounds);
-  // Ensure we don't go smaller than our minimum bounds in "normal" window
-  // modes
-  if (window_->delegate() && !IsMaximized() && !IsFullscreen()) {
-    // Get the minimum usable size of the minimum size and the screen size.
-    gfx::Size min_size = window_->delegate()->GetMinimumSize();
-    min_size.SetToMin(gfx::Screen::GetScreenFor(
-        window_)->GetDisplayNearestWindow(window_).work_area().size());
-
-    actual_new_bounds.set_width(
-        std::max(min_size.width(), actual_new_bounds.width()));
-    actual_new_bounds.set_height(
-        std::max(min_size.height(), actual_new_bounds.height()));
-  }
-  BoundsSetter().SetBounds(window_, actual_new_bounds);
+  BoundsSetter().SetBounds(window_, bounds);
 }
 
 void WindowState::SetBoundsConstrained(const gfx::Rect& bounds) {
   gfx::Rect work_area_in_parent =
       ScreenUtil::GetDisplayWorkAreaBoundsInParent(window_);
   gfx::Rect child_bounds(bounds);
   AdjustBoundsSmallerThan(work_area_in_parent.size(), &child_bounds);
   SetBoundsDirect(child_bounds);
 }
 
@@ skipping 59 matching lines @@
   }
   return settings;
 }
 
 const WindowState* GetWindowState(const aura::Window* window) {
   return GetWindowState(const_cast<aura::Window*>(window));
 }
 
 }  // namespace wm
 }  // namespace ash