Remove ui/gfx/screen_type_delegate.h

ui/aura/window_tree_host_x11.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/aura/window_tree_host_x11.h"
 
 #include <strings.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/Xrandr.h>
@@ skipping 238 matching lines @@
       case ui::ET_MOUSE_ENTERED:
       case ui::ET_MOUSE_EXITED:
       case ui::ET_MOUSE_PRESSED:
       case ui::ET_MOUSE_RELEASED: {
         ui::MouseEvent mouse_event(xev);
         if (xev->type == EnterNotify) {
           aura::Window* root_window = window();
           client::CursorClient* cursor_client =
               client::GetCursorClient(root_window);
           if (cursor_client) {
-            const gfx::Display display = gfx::Screen::GetScreenFor(
-                root_window)->GetDisplayNearestWindow(root_window);
+            const gfx::Display display =
+                gfx::Screen::GetScreen()->GetDisplayNearestWindow(root_window);
             cursor_client->SetDisplay(display);
           }
           // EnterNotify creates ET_MOUSE_MOVE. Mark as synthesized as this is
           // not a real mouse move event.
           mouse_event.set_flags(mouse_event.flags() | ui::EF_IS_SYNTHESIZED);
         }
 
         TranslateAndDispatchLocatedEvent(&mouse_event);
         break;
       }
@@ skipping 120 matching lines @@
 }
 
 gfx::Rect WindowTreeHostX11::GetBounds() const {
   return bounds_;
 }
 
 void WindowTreeHostX11::SetBounds(const gfx::Rect& bounds) {
   // Even if the host window's size doesn't change, aura's root window
   // size, which is in DIP, changes when the scale changes.
   float current_scale = compositor()->device_scale_factor();
-  float new_scale = gfx::Screen::GetScreenFor(window())->
-      GetDisplayNearestWindow(window()).device_scale_factor();
+  float new_scale = gfx::Screen::GetScreen()
+                        ->GetDisplayNearestWindow(window())
+                        .device_scale_factor();
   bool origin_changed = bounds_.origin() != bounds.origin();
   bool size_changed = bounds_.size() != bounds.size();
   XWindowChanges changes = {0};
   unsigned value_mask = 0;
 
   if (size_changed) {
     changes.width = bounds.width();
     changes.height = bounds.height();
     value_mask = CWHeight | CWWidth;
   }
@@ skipping 144 matching lines @@
 }
 
 namespace test {
 
 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) {
   default_override_redirect = override_redirect;
 }
 
 }  // namespace test
 }  // namespace aura