summaryrefslogtreecommitdiffstats
path: root/ash/touch/touch_observer_hud_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/touch/touch_observer_hud_unittest.cc')
-rw-r--r--ash/touch/touch_observer_hud_unittest.cc16
1 files changed, 6 insertions, 10 deletions
diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc
index f7293a5..e9d544e 100644
--- a/ash/touch/touch_observer_hud_unittest.cc
+++ b/ash/touch/touch_observer_hud_unittest.cc
@@ -118,13 +118,9 @@ class TouchHudTestBase : public test::AshTestBase {
GetDisplayManager()->OnNativeDisplaysChanged(display_info_list_);
}
- int64 internal_display_id() const {
- return internal_display_id_;
- }
+ int64_t internal_display_id() const { return internal_display_id_; }
- int64 external_display_id() const {
- return external_display_id_;
- }
+ int64_t external_display_id() const { return external_display_id_; }
protected:
DisplayManager* GetDisplayManager() {
@@ -183,7 +179,7 @@ class TouchHudTestBase : public test::AshTestBase {
return GetRootWindowController(root);
}
- DisplayInfo CreateDisplayInfo(int64 id, const gfx::Rect& bounds) {
+ DisplayInfo CreateDisplayInfo(int64_t id, const gfx::Rect& bounds) {
DisplayInfo info(id, base::StringPrintf("x-%" PRId64, id), false);
info.SetBounds(bounds);
return info;
@@ -197,9 +193,9 @@ class TouchHudTestBase : public test::AshTestBase {
return hud->widget_;
}
- int64 internal_display_id_;
- int64 external_display_id_;
- int64 mirrored_display_id_;
+ 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_;