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

trunk/src/ash/wm/drag_window_resizer.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/drag_window_resizer.h"
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
@@ skipping 163 matching lines @@
   const float fraction_in_another_window =
       (bounds_in_another_root.width() * bounds_in_another_root.height()) /
       static_cast<float>(bounds.width() * bounds.height());
 
   if (fraction_in_another_window > 0) {
     if (!drag_window_controller_) {
       drag_window_controller_.reset(
           new DragWindowController(GetTarget()));
       // Always show the drag phantom on the |another_root| window.
       drag_window_controller_->SetDestinationDisplay(
-          Shell::GetScreen()->GetDisplayNearestWindow(another_root));
+          Shell::GetScreen()->GetDisplayMatching(
+              another_root->GetBoundsInScreen()));
       drag_window_controller_->Show();
     } else {
       // No animation.
       drag_window_controller_->SetBounds(bounds_in_screen);
     }
     const float phantom_opacity =
       !in_original_root ? 1 : (kMaxOpacity * fraction_in_another_window);
     const float window_opacity =
         in_original_root ? 1 : (kMaxOpacity * (1 - fraction_in_another_window));
     drag_window_controller_->SetOpacity(phantom_opacity);
     GetTarget()->layer()->SetOpacity(window_opacity);
   } else {
     drag_window_controller_.reset();
     GetTarget()->layer()->SetOpacity(1.0f);
   }
 }
 
 bool DragWindowResizer::ShouldAllowMouseWarp() {
   return (details_.window_component == HTCAPTION) &&
       !GetTarget()->transient_parent() &&
       (GetTarget()->type() == aura::client::WINDOW_TYPE_NORMAL ||
        GetTarget()->type() == aura::client::WINDOW_TYPE_PANEL);
 }
 
 }  // namespace internal
 }  // namespace ash