Revert 243986 "Fix AdjustBoundsToEnsureWindowVisibility to work ..."

trunk/src/ash/wm/window_util.cc

 // 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.
 
 #include "ash/wm/window_util.h"
 
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/screen_ash.h"
@@ skipping 76 matching lines @@
 void AdjustBoundsToEnsureWindowVisibility(const gfx::Rect& visible_area,
                                           int min_width,
                                           int min_height,
                                           gfx::Rect* bounds) {
   bounds->set_width(std::min(bounds->width(), visible_area.width()));
   bounds->set_height(std::min(bounds->height(), visible_area.height()));
 
   min_width = std::min(min_width, visible_area.width());
   min_height = std::min(min_height, visible_area.height());
 
-  if (bounds->right() < visible_area.x() + min_width) {
-    bounds->set_x(visible_area.x() + min_width - bounds->width());
-  } else if (bounds->x() > visible_area.right() - min_width) {
+  if (bounds->x() + min_width > visible_area.right()) {
     bounds->set_x(visible_area.right() - min_width);
+  } else if (bounds->right() - min_width < 0) {
+    bounds->set_x(min_width - bounds->width());
   }
-  if (bounds->bottom() < visible_area.y() + min_height) {
-    bounds->set_y(visible_area.y() + min_height - bounds->height());
-  } else if (bounds->y() > visible_area.bottom() - min_height) {
+  if (bounds->y() + min_height > visible_area.bottom()) {
     bounds->set_y(visible_area.bottom() - min_height);
+  } else if (bounds->bottom() - min_height < 0) {
+    bounds->set_y(min_height - bounds->height());
   }
-  if (bounds->y() < visible_area.y())
-    bounds->set_y(visible_area.y());
+  if (bounds->y() < 0)
+    bounds->set_y(0);
 }
 
 bool MoveWindowToEventRoot(aura::Window* window, const ui::Event& event) {
   views::View* target = static_cast<views::View*>(event.target());
   if (!target)
     return false;
   aura::Window* target_root =
       target->GetWidget()->GetNativeView()->GetRootWindow();
   if (!target_root || target_root == window->GetRootWindow())
     return false;
@@ skipping 20 matching lines @@
        ++i) {
     ReparentChildWithTransientChildren(
         views::corewm::GetTransientChildren(child)[i],
         old_parent,
         new_parent);
   }
 }
 
 }  // namespace wm
 }  // namespace ash