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

Unified Diff: ash/touch/touch_observer_hud.h

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_hud_projection.h ('k') | ash/touch/touch_observer_hud_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_observer_hud.h
diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h
index 1a558ee5ed03e972114b3e125df6ba817e53e8e7..4168f370585c8c67352a01e0fcf35ef2c2be1aa9 100644
--- a/ash/touch/touch_observer_hud.h
+++ b/ash/touch/touch_observer_hud.h
@@ -5,8 +5,11 @@
#ifndef ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
#define ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
+#include <stdint.h>
+
#include "ash/ash_export.h"
#include "ash/display/window_tree_host_manager.h"
+#include "base/macros.h"
#include "ui/events/event_handler.h"
#include "ui/gfx/display_observer.h"
#include "ui/views/widget/widget_observer.h"
@@ -38,7 +41,7 @@ class ASH_EXPORT TouchObserverHUD : public ui::EventHandler,
// Removes the HUD from the screen.
void Remove();
- int64 display_id() const { return display_id_; }
+ int64_t display_id() const { return display_id_; }
protected:
explicit TouchObserverHUD(aura::Window* initial_root);
@@ -78,7 +81,7 @@ class ASH_EXPORT TouchObserverHUD : public ui::EventHandler,
private:
friend class TouchHudTestBase;
- const int64 display_id_;
+ const int64_t display_id_;
aura::Window* root_window_;
views::Widget* widget_;
« no previous file with comments | « ash/touch/touch_hud_projection.h ('k') | ash/touch/touch_observer_hud_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698