ash/touch/touch_transformer_controller.cc - Issue 1540753002: Switch to standard integer types in ash/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/touch/touch_transformer_controller.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:

Index: ash/touch/touch_transformer_controller.cc

diff --git a/ash/touch/touch_transformer_controller.cc b/ash/touch/touch_transformer_controller.cc

index 142fdf151ced9562b0640889cd299f3ad8bb9fad..0af8c8d86e4f6aa5a307ca04f170f9bb45d64f24 100644

--- a/ash/touch/touch_transformer_controller.cc

+++ b/ash/touch/touch_transformer_controller.cc

@@ -154,12 +154,12 @@ void TouchTransformerController::UpdateTouchTransformer() const {

device_manager->ClearTouchDeviceAssociations();

// Display IDs and DisplayInfo for mirror or extended mode.

- int64 display1_id = gfx::Display::kInvalidDisplayID;

- int64 display2_id = gfx::Display::kInvalidDisplayID;

+ int64_t display1_id = gfx::Display::kInvalidDisplayID;

+ int64_t display2_id = gfx::Display::kInvalidDisplayID;

DisplayInfo display1;

DisplayInfo display2;

// Display ID and DisplayInfo for single display mode.

- int64 single_display_id = gfx::Display::kInvalidDisplayID;

+ int64_t single_display_id = gfx::Display::kInvalidDisplayID;

DisplayInfo single_display;

WindowTreeHostManager* window_tree_host_manager =