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

ash/wm/drag_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/drag_window_resizer.h"
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/window_positioning_utils.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/drag_window_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.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/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 
 // static
 DragWindowResizer* DragWindowResizer::instance_ = NULL;
 
 DragWindowResizer::~DragWindowResizer() {
   if (window_state_)
@@ skipping 14 matching lines @@
 
 void DragWindowResizer::Drag(const gfx::Point& location, int event_flags) {
   base::WeakPtr<DragWindowResizer> resizer(weak_ptr_factory_.GetWeakPtr());
   next_window_resizer_->Drag(location, event_flags);
 
   if (!resizer)
     return;
 
   last_mouse_location_ = location;
   // Show a phantom window for dragging in another root window.
-  if (gfx::Screen::GetScreen()->GetNumDisplays() > 1) {
+  if (display::Screen::GetScreen()->GetNumDisplays() > 1) {
     gfx::Point location_in_screen = location;
     ::wm::ConvertPointToScreen(GetAuraTarget()->parent(), &location_in_screen);
     UpdateDragWindow(GetAuraTarget()->bounds(), location_in_screen);
   } else {
     drag_window_controller_.reset();
   }
 }
 
 void DragWindowResizer::CompleteDrag() {
   next_window_resizer_->CompleteDrag();
 
   GetAuraTarget()->layer()->SetOpacity(details().initial_opacity);
   drag_window_controller_.reset();
 
   // Check if the destination is another display.
   gfx::Point last_mouse_location_in_screen = last_mouse_location_;
   ::wm::ConvertPointToScreen(GetAuraTarget()->parent(),
                              &last_mouse_location_in_screen);
-  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_mouse_location_in_screen);
 
   if (dst_display.id() !=
       screen->GetDisplayNearestWindow(GetAuraTarget()->GetRootWindow()).id()) {
     // Adjust the size and position so that it doesn't exceed the size of
     // work area.
     const gfx::Size& size = dst_display.work_area().size();
     gfx::Rect bounds = GetAuraTarget()->bounds();
     if (bounds.width() > size.width()) {
       int diff = bounds.width() - size.width();
@@ skipping 76 matching lines @@
   return details().window_component == HTCAPTION &&
          !::wm::GetTransientParent(GetAuraTarget()) &&
          wm::IsWindowUserPositionable(GetAuraTarget());
 }
 
 aura::Window* DragWindowResizer::GetAuraTarget() {
   return wm::WmWindowAura::GetAuraWindow(GetTarget());
 }
 
 }  // namespace ash