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

Unified Diff: ash/host/ash_window_tree_host_x11.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/host/ash_window_tree_host_x11.h ('k') | ash/host/transformer_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/ash_window_tree_host_x11.cc
diff --git a/ash/host/ash_window_tree_host_x11.cc b/ash/host/ash_window_tree_host_x11.cc
index a6971b5cae77d15f3d57308a5569a6b73eb76b7c..24332afee87e3612853c01a9fb79c86217a56ead 100644
--- a/ash/host/ash_window_tree_host_x11.cc
+++ b/ash/host/ash_window_tree_host_x11.cc
@@ -16,7 +16,6 @@
#include "ash/host/ash_window_tree_host_unified.h"
#include "ash/host/root_window_transformer.h"
#include "ash/ime/input_method_event_handler.h"
-#include "base/basictypes.h"
#include "base/sys_info.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
@@ -207,7 +206,7 @@ bool AshWindowTreeHostX11::CanDispatchEvent(const ui::PlatformEvent& event) {
case ui::ET_TOUCH_RELEASED: {
#if defined(OS_CHROMEOS)
XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(xev->xcookie.data);
- int64 touch_display_id =
+ int64_t touch_display_id =
ui::DeviceDataManager::GetInstance()->GetTargetDisplayForTouchDevice(
xiev->deviceid);
// If we don't have record of display id for this touch device, check
« no previous file with comments | « ash/host/ash_window_tree_host_x11.h ('k') | ash/host/transformer_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698