Revert 213347 "Use GetDisplayNearestWindow instead of GetDislpa..."

trunk/src/ash/wm/workspace/auto_window_management.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/workspace/auto_window_management.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_animations.h"
@@ skipping 51 matching lines @@
       // Bail if we find a second usable window.
       if (*other_window)
         return false;
       *other_window = iterated_window;
     }
   }
   return *other_window != NULL;
 }
 
 // Get the work area for a given |window|.
-gfx::Rect GetWorkAreaForWindow(aura::Window* window) {
-  return Shell::GetScreen()->GetDisplayNearestWindow(window).work_area();
+gfx::Rect GetWorkAreaForWindow(const aura::Window* window) {
+  gfx::Rect work_area = gfx::Rect(window->parent()->bounds().size());
+  work_area.Inset(Shell::GetScreen()->GetDisplayMatching(
+      work_area).GetWorkAreaInsets());
+  return work_area;
 }
 
 // Move the given |bounds| on the available |parent_width| to the
 // direction. If |move_right| is true, the rectangle gets moved to the right
 // corner, otherwise to the left one.
 bool MoveRectToOneSide(int parent_width, bool move_right, gfx::Rect* bounds) {
   if (move_right) {
     if (parent_width > bounds->right()) {
       bounds->set_x(parent_width - bounds->width());
       return true;
@@ skipping 98 matching lines @@
     // Since it is just coming into view, we do not need to animate it.
     gfx::Rect added_bounds = added_window->bounds();
     ash::wm::SetPreAutoManageWindowBounds(added_window, added_bounds);
     if (MoveRectToOneSide(work_area.width(), !move_right, &added_bounds))
       added_window->SetBounds(added_bounds);
   }
 }
 
 } // namespace internal
 } // namespace ash