Reland "Add display::GetDisplayNearestView"

ui/views/mus/screen_mus.cc

 // Copyright 2016 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.
 
 // This has to be before any other includes, else default is picked up.
 // See base/logging for details on this.
 #define NOTIMPLEMENTED_POLICY 5
 
 #include "ui/views/mus/screen_mus.h"
 
@@ skipping 57 matching lines @@
   if (display_list().displays().empty()) {
     DCHECK(display_manager_.encountered_error() || !success);
     // In this case we install a default display and assume the process is
     // going to exit shortly so that the real value doesn't matter.
     display_list().AddDisplay(
         display::Display(0xFFFFFFFF, gfx::Rect(0, 0, 801, 802)), Type::PRIMARY);
   }
 }
 
 display::Display ScreenMus::GetDisplayNearestWindow(
-    aura::Window* window) const {
+    gfx::NativeWindow window) const {
   aura::WindowTreeHostMus* window_tree_host_mus =
       aura::WindowTreeHostMus::ForWindow(window);
   if (!window_tree_host_mus)
     return GetPrimaryDisplay();
   return window_tree_host_mus->GetDisplay();
 }
 
 gfx::Point ScreenMus::GetCursorScreenPoint() {
   return aura::Env::GetInstance()->last_mouse_location();
 }
@@ skipping 61 matching lines @@
   // TODO(kylechar): DisplayList would need to change to handle having no
   // primary display.
   if (primary_display_id == display::kInvalidDisplayId)
     return;
 
   ProcessDisplayChanged(*display_list().FindDisplayById(primary_display_id),
                         true);
 }
 
 }  // namespace views