Move ash::DisplayInfo to ui

chrome/browser/chromeos/display/overscan_calibrator.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 "chrome/browser/chromeos/display/overscan_calibrator.h"
 
 #include <stdint.h>
 
 #include <limits>
 
-#include "ash/common/display/display_info.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
 #include "base/callback.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/paint_recorder.h"
+#include "ui/display/manager/display_info.h"
 #include "ui/gfx/canvas.h"
 
 namespace chromeos {
 namespace {
 
 // The opacity for the arrows of the overscan calibration.
 const float kArrowOpacity = 0.8;
 
 // The height in pixel for the arrows to show the overscan calibration.
 const int kCalibrationArrowHeight = 70;
@@ skipping 42 matching lines @@
                                        const gfx::Insets& initial_insets)
     : display_(target_display),
       insets_(initial_insets),
       initial_insets_(initial_insets),
       committed_(false) {
   // Undo the overscan calibration temporarily so that the user can see
   // dark boundary and current overscan region.
   ash::Shell::GetInstance()->window_tree_host_manager()->SetOverscanInsets(
       display_.id(), gfx::Insets());
 
-  ash::DisplayInfo info =
+  ui::DisplayInfo info =
       ash::Shell::GetInstance()->display_manager()->GetDisplayInfo(
           display_.id());
 
   aura::Window* root = ash::Shell::GetInstance()
                            ->window_tree_host_manager()
                            ->GetRootWindowForDisplayId(display_.id());
   ui::Layer* parent_layer =
       ash::Shell::GetContainer(root, ash::kShellWindowId_OverlayContainer)
           ->layer();
 
@@ skipping 61 matching lines @@
     float device_scale_factor) {
   // TODO(mukai): Cancel the overscan calibration when the device
   // configuration has changed.
 }
 
 base::Closure OverscanCalibrator::PrepareForLayerBoundsChange() {
   return base::Closure();
 }
 
 }  // namespace chromeos