Rename gfx::Display/Screen to display::Display/Screen in ash

ash/wm/dock/docked_window_resizer.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/dock/docked_window_resizer.h"
 
 #include "ash/wm/common/dock/docked_window_layout_manager.h"
 #include "ash/wm/common/window_parenting_utils.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/wm_event.h"
 #include "ash/wm/common/wm_root_window_controller.h"
 #include "ash/wm/common/wm_shell_window_ids.h"
 #include "ash/wm/common/wm_window.h"
 #include "ash/wm/workspace/magnetism_matcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 
 namespace ash {
 namespace {
 
 DockedWindowLayoutManager* GetDockedLayoutManagerAtPoint(
     const gfx::Point& point) {
-  gfx::Display display =
-      gfx::Screen::GetScreen()->GetDisplayNearestPoint(point);
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayNearestPoint(point);
   if (!display.bounds().Contains(point))
     return nullptr;
 
   return DockedWindowLayoutManager::Get(
       wm::WmRootWindowController::GetWithDisplayId(display.id())->GetWindow());
 }
 
 }  // namespace
 
 DockedWindowResizer::~DockedWindowResizer() {
@@ skipping 274 matching lines @@
   } else if (window->GetWindowState()->IsDocked() &&
              action == DOCKED_ACTION_UNDOCK) {
     const wm::WMEvent event(wm::WM_EVENT_NORMAL);
     window_state_->OnWMEvent(&event);
   }
 
   return action;
 }
 
 }  // namespace ash