Reland "Add display::GetDisplayNearestView"

ui/display/win/screen_win.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 "ui/display/win/screen_win.h"
 
 #include <windows.h>
 #include <shellscalingapi.h>
 
 #include <algorithm>
@@ skipping 375 matching lines @@
 }
 
 int ScreenWin::GetNumDisplays() const {
   return static_cast<int>(screen_win_displays_.size());
 }
 
 const std::vector<Display>& ScreenWin::GetAllDisplays() const {
   return displays_;
 }
 
-Display ScreenWin::GetDisplayNearestWindow(gfx::NativeView window) const {
+Display ScreenWin::GetDisplayNearestWindow(gfx::NativeWindow window) const {
   HWND window_hwnd = GetHWNDFromNativeView(window);
   if (!window_hwnd) {
     // When |window| isn't rooted to a display, we should just return the
     // default display so we get some correct display information like the
     // scaling factor.
     return GetPrimaryDisplay();
   }
   ScreenWinDisplay screen_win_display =
       GetScreenWinDisplayNearestHWND(window_hwnd);
   return screen_win_display.display();
@@ skipping 185 matching lines @@
     if (std::find(unique_scale_factors.begin(), unique_scale_factors.end(),
                   reported_scale) == unique_scale_factors.end()) {
       unique_scale_factors.push_back(reported_scale);
       UMA_HISTOGRAM_SPARSE_SLOWLY("UI.DeviceScale", reported_scale);
     }
   }
 }
 
 }  // namespace win
 }  // namespace display