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

ash/wm/panels/panel_window_resizer.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 "ash/wm/panels/panel_window_resizer.h"
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/window_parenting_utils.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/wm_root_window_controller.h"
 #include "ash/wm/common/wm_window.h"
 #include "ash/wm/panels/panel_layout_manager.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 const int kPanelSnapToLauncherDistance = 30;
 
 }  // namespace
 
 PanelWindowResizer::~PanelWindowResizer() {
 }
 
 // static
 PanelWindowResizer*
 PanelWindowResizer::Create(WindowResizer* next_window_resizer,
                            wm::WindowState* window_state) {
   return new PanelWindowResizer(next_window_resizer, window_state);
 }
 
 void PanelWindowResizer::Drag(const gfx::Point& location, int event_flags) {
   last_location_ = GetTarget()->GetParent()->ConvertPointToScreen(location);
   if (!did_move_or_resize_) {
     did_move_or_resize_ = true;
     StartedDragging();
   }
 
   // Check if the destination has changed displays.
-  gfx::Screen* screen = gfx::Screen::GetScreen();
-  const gfx::Display dst_display =
+  display::Screen* screen = display::Screen::GetScreen();
+  const display::Display dst_display =
       screen->GetDisplayNearestPoint(last_location_);
   if (dst_display.id() !=
       panel_container_->GetRootWindow()->GetDisplayNearestWindow().id()) {
     // The panel is being dragged to a new display. If the previous container is
     // the current parent of the panel it will be informed of the end of drag
     // when the panel is reparented, otherwise let the previous container know
     // the drag is complete. If we told the panel's parent that the drag was
     // complete it would begin positioning the panel.
     if (GetTarget()->GetParent() != panel_container_)
       PanelLayoutManager::Get(panel_container_)->FinishDragging();
@@ skipping 141 matching lines @@
 void PanelWindowResizer::UpdateLauncherPosition() {
   if (panel_container_) {
     PanelLayoutManager::Get(panel_container_)
         ->shelf()
         ->UpdateIconPositionForWindow(
             wm::WmWindowAura::GetAuraWindow(GetTarget()));
   }
 }
 
 }  // namespace ash