Remove ui/gfx/screen_type_delegate.h

ash/wm/window_state.cc

 // Copyright 2013 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 "ash/wm/window_state.h"
 
 #include <utility>
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
@@ skipping 397 matching lines @@
                     OnPostWindowStateTypeChange(this, old_window_state_type));
 }
 
 void WindowState::SetBoundsDirect(const gfx::Rect& bounds) {
   gfx::Rect actual_new_bounds(bounds);
   // Ensure we don't go smaller than our minimum bounds in "normal" window
   // modes
   if (window_->delegate() && !IsMaximized() && !IsFullscreen()) {
     // Get the minimum usable size of the minimum size and the screen size.
     gfx::Size min_size = window_->delegate()->GetMinimumSize();
-    min_size.SetToMin(gfx::Screen::GetScreenFor(
-        window_)->GetDisplayNearestWindow(window_).work_area().size());
+    min_size.SetToMin(gfx::Screen::GetScreen()
+                          ->GetDisplayNearestWindow(window_)
+                          .work_area()
+                          .size());
 
     actual_new_bounds.set_width(
         std::max(min_size.width(), actual_new_bounds.width()));
     actual_new_bounds.set_height(
         std::max(min_size.height(), actual_new_bounds.height()));
   }
   BoundsSetter().SetBounds(window_, actual_new_bounds);
   SnapWindowToPixelBoundary(window_);
 }
 
@@ skipping 67 matching lines @@
   }
   return settings;
 }
 
 const WindowState* GetWindowState(const aura::Window* window) {
   return GetWindowState(const_cast<aura::Window*>(window));
 }
 
 }  // namespace wm
 }  // namespace ash