Reland "Add display::GetDisplayNearestView"

ui/aura/test/test_screen.h

 // 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.
 
 #ifndef UI_AURA_TEST_TEST_SCREEN_H_
 #define UI_AURA_TEST_TEST_SCREEN_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "ui/aura/window_observer.h"
@@ skipping 35 matching lines @@
   // WindowObserver overrides:
   void OnWindowBoundsChanged(Window* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
   void OnWindowDestroying(Window* window) override;
 
   // display::Screen overrides:
   gfx::Point GetCursorScreenPoint() override;
   bool IsWindowUnderCursor(gfx::NativeWindow window) override;
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
-  display::Display GetDisplayNearestWindow(gfx::NativeView view) const override;
+  display::Display GetDisplayNearestWindow(
+      gfx::NativeWindow window) const override;
 
  private:
   TestScreen(const gfx::Rect& screen_bounds,
              WindowTreeClient* window_tree_client);
 
   aura::WindowTreeHost* host_;
 
   float ui_scale_;
 
   WindowTreeClient* window_tree_client_;
 
   DISALLOW_COPY_AND_ASSIGN(TestScreen);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_TEST_SCREEN_H_