Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2791)

Unified Diff: ash/touch/touch_observer_hud_unittest.cc

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/touch/touch_observer_hud.h ('k') | ash/touch/touch_transformer_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f7293a55a429d3ee8bb6d7e7049355b91d3985c8..e9d544e1fad3ada844698bab0bf1c7f4113c3517 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_;
« no previous file with comments | « ash/touch/touch_observer_hud.h ('k') | ash/touch/touch_transformer_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698