Remove ui/gfx/screen_type_delegate.h

chrome/browser/ui/views/tabs/window_finder_x11.cc

 // Copyright 2014 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 "chrome/browser/ui/views/tabs/window_finder.h"
 
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/desktop_aura/x11_topmost_window_finder.h"
 
 namespace {
 
 float GetDeviceScaleFactor() {
-  gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
+  gfx::Display display = gfx::Screen::GetScreen()->GetPrimaryDisplay();
   return display.device_scale_factor();

[oshima, 2016/01/19 20:44:31]

can this be single line?

[scottmg, 2016/01/19 21:55:57]

Done.

 }
 
 gfx::Point DIPToPixelPoint(const gfx::Point& dip_point) {
   return gfx::ScaleToFlooredPoint(dip_point, GetDeviceScaleFactor());
 }
 
 }  // anonymous namespace
 
 #if defined(USE_ASH)
 gfx::NativeWindow GetLocalProcessWindowAtPointAsh(
     const gfx::Point& screen_point,
     const std::set<gfx::NativeWindow>& ignore);
 #endif
 
 gfx::NativeWindow GetLocalProcessWindowAtPoint(
     chrome::HostDesktopType host_desktop_type,
     const gfx::Point& screen_point,
     const std::set<gfx::NativeWindow>& ignore) {
 #if defined(USE_ASH)
   if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
     return GetLocalProcessWindowAtPointAsh(screen_point, ignore);
 #endif
 
   // The X11 server is the canonical state of what the window stacking order
   // is.
   views::X11TopmostWindowFinder finder;
   return finder.FindLocalProcessWindowAt(DIPToPixelPoint(screen_point), ignore);
 }