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

ash/touch/touch_observer_hud_unittest.cc

 // Copyright (c) 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_observer_hud.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
@@ skipping 26 matching lines @@
     mirrored_display_id_ = 11;
 
     internal_display_info_ =
         CreateDisplayInfo(internal_display_id_, gfx::Rect(0, 0, 500, 500));
     external_display_info_ =
         CreateDisplayInfo(external_display_id_, gfx::Rect(1, 1, 100, 100));
     mirrored_display_info_ =
         CreateDisplayInfo(mirrored_display_id_, gfx::Rect(0, 0, 100, 100));
   }
 
-  gfx::Display GetPrimaryDisplay() {
-    return gfx::Screen::GetScreen()->GetPrimaryDisplay();
+  display::Display GetPrimaryDisplay() {
+    return display::Screen::GetScreen()->GetPrimaryDisplay();
   }
 
-  const gfx::Display& GetSecondaryDisplay() {
+  const display::Display& GetSecondaryDisplay() {
     return ScreenUtil::GetSecondaryDisplay();
   }
 
   void SetupSingleDisplay() {
     display_info_list_.clear();
     display_info_list_.push_back(internal_display_info_);
     GetDisplayManager()->OnNativeDisplaysChanged(display_info_list_);
   }
 
   void SetupDualDisplays() {
@@ skipping 58 matching lines @@
 
  protected:
   DisplayManager* GetDisplayManager() {
     return Shell::GetInstance()->display_manager();
   }
 
   WindowTreeHostManager* GetWindowTreeHostManager() {
     return Shell::GetInstance()->window_tree_host_manager();
   }
 
-  const gfx::Display& GetInternalDisplay() {
+  const display::Display& GetInternalDisplay() {
     return GetDisplayManager()->GetDisplayForId(internal_display_id_);
   }
 
-  const gfx::Display& GetExternalDisplay() {
+  const display::Display& GetExternalDisplay() {
     return GetDisplayManager()->GetDisplayForId(external_display_id_);
   }
 
   aura::Window* GetInternalRootWindow() {
     return GetWindowTreeHostManager()->GetRootWindowForDisplayId(
         internal_display_id_);
   }
 
   aura::Window* GetExternalRootWindow() {
     return GetWindowTreeHostManager()->GetRootWindowForDisplayId(
         external_display_id_);
   }
 
   aura::Window* GetPrimaryRootWindow() {
-    const gfx::Display& display = GetPrimaryDisplay();
+    const display::Display& display = GetPrimaryDisplay();
     return GetWindowTreeHostManager()->GetRootWindowForDisplayId(display.id());
   }
 
   aura::Window* GetSecondaryRootWindow() {
-    const gfx::Display& display = GetSecondaryDisplay();
+    const display::Display& display = GetSecondaryDisplay();
     return GetWindowTreeHostManager()->GetRootWindowForDisplayId(display.id());
   }
 
   RootWindowController* GetInternalRootController() {
     aura::Window* root = GetInternalRootWindow();
     return GetRootWindowController(root);
   }
 
   RootWindowController* GetExternalRootController() {
     aura::Window* root = GetExternalRootWindow();
@@ skipping 443 matching lines @@
 
   SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
   EXPECT_EQ(1, GetInternalTouchPointsCount());
 
   // Disabling projection touch HUD shoud remove it without crashing.
   DisableTouchHudProjection();
   EXPECT_EQ(NULL, GetInternalTouchHudProjection());
 }
 
 }  // namespace ash