Reland "Add display::GetDisplayNearestView"

ui/display/win/screen_win.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_DISPLAY_WIN_SCREEN_WIN_H_
 #define UI_DISPLAY_WIN_SCREEN_WIN_H_
 
 #include <windows.h>
 
 #include <memory>
@@ skipping 92 matching lines @@
   static float GetScaleFactorForHWND(HWND hwnd);
 
   // Returns the system's global scale factor, ignoring the value of
   // --force-device-scale-factor. Only use this if you are working with Windows
   // metrics global to the system. Otherwise you should call
   // GetScaleFactorForHWND() to get the correct scale factor for the monitor
   // you are targeting.
   static float GetSystemScaleFactor();
 
   // Returns the HWND associated with the NativeView.
-  virtual HWND GetHWNDFromNativeView(gfx::NativeView window) const;
+  virtual HWND GetHWNDFromNativeView(gfx::NativeView view) const;
 
   // Returns the NativeView associated with the HWND.
   virtual gfx::NativeWindow GetNativeWindowFromHWND(HWND hwnd) const;
 
  protected:
   // Screen:
   gfx::Point GetCursorScreenPoint() override;
   bool IsWindowUnderCursor(gfx::NativeWindow window) override;
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
   int GetNumDisplays() const override;
   const std::vector<Display>& GetAllDisplays() const override;
-  Display GetDisplayNearestWindow(gfx::NativeView window) const override;
+  Display GetDisplayNearestWindow(gfx::NativeWindow window) const override;
   Display GetDisplayNearestPoint(const gfx::Point& point) const override;
   Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
   Display GetPrimaryDisplay() const override;
   void AddObserver(DisplayObserver* observer) override;
   void RemoveObserver(DisplayObserver* observer) override;
   gfx::Rect ScreenToDIPRectInWindow(
       gfx::NativeView view, const gfx::Rect& screen_rect) const override;
   gfx::Rect DIPToScreenRectInWindow(
       gfx::NativeView view, const gfx::Rect& dip_rect) const override;
 
@@ skipping 57 matching lines @@
   // This must be updated anytime |screen_win_displays_| is updated.
   std::vector<Display> displays_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreenWin);
 };
 
 }  // namespace win
 }  // namespace display
 
 #endif  // UI_DISPLAY_WIN_SCREEN_WIN_H_