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

chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc

 // Copyright 2014 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 "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/ui/focus_ring_layer.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 
 namespace chromeos {
 
 namespace {
 
 // The number of pixels the focus ring is outset from the object it outlines,
 // which also determines the border radius of the rounded corners.
 // TODO(dmazzoni): take display resolution into account.
 const int kAccessibilityFocusRingMargin = 7;
 
@@ skipping 73 matching lines @@
   if (compositor_ && compositor_->HasAnimationObserver(this)) {
     focus_change_time_ = base::TimeTicks::Now();
   } else {
     // If we can't animate, set the location of the first ring.
     layers_[0]->Set(rings_[0]);
   }
 }
 
 ui::Compositor* AccessibilityFocusRingController::CompositorForBounds(
     const gfx::Rect& bounds) {
-  gfx::Display display = gfx::Screen::GetScreen()->GetDisplayMatching(bounds);
+  display::Display display =
+      display::Screen::GetScreen()->GetDisplayMatching(bounds);
   aura::Window* root_window = ash::Shell::GetInstance()
                                   ->window_tree_host_manager()
                                   ->GetRootWindowForDisplayId(display.id());
   return root_window->layer()->GetCompositor();
 }
 
 void AccessibilityFocusRingController::RemoveAnimationObservers() {
   if (compositor_ && compositor_->HasAnimationObserver(this))
     compositor_->RemoveAnimationObserver(this);
   if (cursor_compositor_ && cursor_compositor_->HasAnimationObserver(this))
@@ skipping 324 matching lines @@
   if (compositor == compositor_ || compositor == cursor_compositor_)
     compositor->RemoveAnimationObserver(this);
 
   if (compositor == compositor_)
     compositor_ = nullptr;
   if (compositor == cursor_compositor_)
     cursor_compositor_ = nullptr;
 }
 
 }  // namespace chromeos