Index: ash/touch/touch_observer_hud_unittest.cc |
diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc |
index ce53028ce53d26cf6f56f6d084a517f55147ad2e..69a7902a31af5cb0b67f66c6ed5636588a779340 100644 |
--- a/ash/touch/touch_observer_hud_unittest.cc |
+++ b/ash/touch/touch_observer_hud_unittest.cc |
@@ -176,8 +176,8 @@ class TouchHudTestBase : public test::AshTestBase { |
return GetRootWindowController(root); |
} |
- DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) { |
- DisplayInfo info(id, base::StringPrintf("x-%" PRId64, id), false); |
+ ui::DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) { |
+ ui::DisplayInfo info(id, base::StringPrintf("x-%" PRId64, id), false); |
info.SetBounds(bounds); |
return info; |
} |
@@ -193,11 +193,11 @@ class TouchHudTestBase : public test::AshTestBase { |
int64_t internal_display_id_; |
int64_t external_display_id_; |
int64_t mirrored_display_id_; |
- DisplayInfo internal_display_info_; |
- DisplayInfo external_display_info_; |
- DisplayInfo mirrored_display_info_; |
+ ui::DisplayInfo internal_display_info_; |
+ ui::DisplayInfo external_display_info_; |
+ ui::DisplayInfo mirrored_display_info_; |
- std::vector<DisplayInfo> display_info_list_; |
+ std::vector<ui::DisplayInfo> display_info_list_; |
DISALLOW_COPY_AND_ASSIGN(TouchHudTestBase); |
}; |