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

ash/touch/touch_hud_debug.cc

 // Copyright 2013 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/touch/touch_hud_debug.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/display/display.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
@@ skipping 287 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TouchHudCanvas);
 };
 
 TouchHudDebug::TouchHudDebug(aura::Window* initial_root)
     : TouchObserverHUD(initial_root),
       mode_(FULLSCREEN),
       touch_log_(new TouchLog()),
       canvas_(NULL),
       label_container_(NULL) {
-  const gfx::Display& display =
+  const display::Display& display =
       Shell::GetInstance()->display_manager()->GetDisplayForId(display_id());
 
   views::View* content = widget()->GetContentsView();
 
   canvas_ = new TouchHudCanvas(*touch_log_);
   content->AddChildView(canvas_);
 
   const gfx::Size& display_size = display.size();
   canvas_->SetSize(display_size);
 
@@ skipping 109 matching lines @@
 void TouchHudDebug::OnTouchEvent(ui::TouchEvent* event) {
   if (event->touch_id() >= kMaxTouchPoints)
     return;
 
   touch_log_->AddTouchPoint(*event);
   canvas_->TouchPointAdded(event->touch_id());
   UpdateTouchPointLabel(event->touch_id());
   label_container_->SetSize(label_container_->GetPreferredSize());
 }
 
-void TouchHudDebug::OnDisplayMetricsChanged(const gfx::Display& display,
+void TouchHudDebug::OnDisplayMetricsChanged(const display::Display& display,
                                             uint32_t metrics) {
   TouchObserverHUD::OnDisplayMetricsChanged(display, metrics);
 
   if (display.id() != display_id() || !(metrics & DISPLAY_METRIC_BOUNDS))
     return;
   const gfx::Size& size = display.size();
   canvas_->SetSize(size);
   label_container_->SetY(size.height() / kReducedScale);
 }
 
 void TouchHudDebug::SetHudForRootWindowController(
     RootWindowController* controller) {
   controller->set_touch_hud_debug(this);
 }
 
 void TouchHudDebug::UnsetHudForRootWindowController(
     RootWindowController* controller) {
   controller->set_touch_hud_debug(NULL);
 }
 
 }  // namespace ash