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

ash/wm/drag_window_controller.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_controller.h"
 
 #include <algorithm>
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
@@ skipping 14 matching lines @@
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 
 // This keeps tack of the drag window's state. It creates/destory/updates bounds
 // and opacity based on the current bounds.
 class DragWindowController::DragWindowDetails : public aura::WindowDelegate {
  public:
-  DragWindowDetails(const gfx::Display& display, aura::Window* original_window)
+  DragWindowDetails(const display::Display& display,
+                    aura::Window* original_window)
       : root_window_(Shell::GetInstance()
                          ->window_tree_host_manager()
                          ->GetRootWindowForDisplayId(display.id())) {}
 
   ~DragWindowDetails() override {
     delete drag_window_;
     DCHECK(!drag_window_);
   }
 
   void Update(aura::Window* original_window,
@@ skipping 129 matching lines @@
   // The maximum opacity of the drag phantom window.
   static const float kMaxOpacity = 0.8f;
 
   return kMaxOpacity * visible_bounds.size().GetArea() /
          window_bounds.size().GetArea();
 }
 
 DragWindowController::DragWindowController(aura::Window* window)
     : window_(window) {
   DCHECK(drag_windows_.empty());
-  gfx::Screen* screen = gfx::Screen::GetScreen();
-  gfx::Display current = screen->GetDisplayNearestWindow(window_);
+  display::Screen* screen = display::Screen::GetScreen();
+  display::Display current = screen->GetDisplayNearestWindow(window_);
 
-  for (const gfx::Display& display : screen->GetAllDisplays()) {
+  for (const display::Display& display : screen->GetAllDisplays()) {
     if (current.id() == display.id())
       continue;
     drag_windows_.push_back(
         base::WrapUnique(new DragWindowDetails(display, window_)));
   }
 }
 
 DragWindowController::~DragWindowController() {}
 
 void DragWindowController::Update(const gfx::Rect& bounds_in_screen,
@@ skipping 29 matching lines @@
     if (details->layer_owner_) {
       if (index == 0)
         return details->layer_owner_.get();
       index--;
     }
   }
   return nullptr;
 }
 
 }  // namespace ash