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

ash/touch/touch_observer_hud.cc

Index: ash/touch/touch_observer_hud.cc
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
index 72f9a4e072ca0cc2d6d0967c67d0ed9280290fbb..93a8dbeccedfb5f947b83ecf169a63c2be484f99 100644
--- a/ash/touch/touch_observer_hud.cc
+++ b/ash/touch/touch_observer_hud.cc
@@ -9,10 +9,10 @@
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
-#include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
@@ -21,7 +21,7 @@ TouchObserverHUD::TouchObserverHUD(aura::Window* initial_root)
     : display_id_(GetRootWindowSettings(initial_root)->display_id),
       root_window_(initial_root),
       widget_(NULL) {
-  const gfx::Display& display =
+  const display::Display& display =
       Shell::GetInstance()->display_manager()->GetDisplayForId(display_id_);
 
   views::View* content = new views::View;
@@ -46,7 +46,7 @@ TouchObserverHUD::TouchObserverHUD(aura::Window* initial_root)
   widget_->AddObserver(this);
 
   // Observe changes in display size and mode to update touch HUD.
-  gfx::Screen::GetScreen()->AddObserver(this);
+  display::Screen::GetScreen()->AddObserver(this);
 #if defined(OS_CHROMEOS)
   Shell::GetInstance()->display_configurator()->AddObserver(this);
 #endif  // defined(OS_CHROMEOS)
@@ -61,7 +61,7 @@ TouchObserverHUD::~TouchObserverHUD() {
 #if defined(OS_CHROMEOS)
   Shell::GetInstance()->display_configurator()->RemoveObserver(this);
 #endif  // defined(OS_CHROMEOS)
-  gfx::Screen::GetScreen()->RemoveObserver(this);
+  display::Screen::GetScreen()->RemoveObserver(this);
 
   widget_->RemoveObserver(this);
 }
@@ -86,15 +86,15 @@ void TouchObserverHUD::OnWidgetDestroying(views::Widget* widget) {
   delete this;
 }
 
-void TouchObserverHUD::OnDisplayAdded(const gfx::Display& new_display) {}
+void TouchObserverHUD::OnDisplayAdded(const display::Display& new_display) {}
 
-void TouchObserverHUD::OnDisplayRemoved(const gfx::Display& old_display) {
+void TouchObserverHUD::OnDisplayRemoved(const display::Display& old_display) {
   if (old_display.id() != display_id_)
     return;
   widget_->CloseNow();
 }
 
-void TouchObserverHUD::OnDisplayMetricsChanged(const gfx::Display& display,
+void TouchObserverHUD::OnDisplayMetricsChanged(const display::Display& display,
                                                uint32_t metrics) {
   if (display.id() != display_id_ || !(metrics & DISPLAY_METRIC_BOUNDS))
     return;