summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorvarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-16 19:51:50 +0000
committervarunjain@chromium.org <varunjain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-16 19:51:50 +0000
commit344aa38c679221826d5fb0cf1b04072a818e634d (patch)
treed789b7ca2a2d5ab37796ea26104628256420bbb6 /ash
parent14b7e9a496852c1b869749c506d3576fcc6fcf96 (diff)
downloadchromium_src-344aa38c679221826d5fb0cf1b04072a818e634d.zip
chromium_src-344aa38c679221826d5fb0cf1b04072a818e634d.tar.gz
chromium_src-344aa38c679221826d5fb0cf1b04072a818e634d.tar.bz2
Fix display id type in long press affordance handler. Currently, the affordance
does not show up because the display id gets mangled due to mismatching type. BUG=155523 Review URL: https://chromiumcodereview.appspot.com/11189005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/wm/gestures/long_press_affordance_handler.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/gestures/long_press_affordance_handler.h b/ash/wm/gestures/long_press_affordance_handler.h
index feed125..c21a587 100644
--- a/ash/wm/gestures/long_press_affordance_handler.h
+++ b/ash/wm/gestures/long_press_affordance_handler.h
@@ -68,7 +68,7 @@ class LongPressAffordanceHandler : public ui::AnimationDelegate,
gfx::Point tap_down_location_;
int tap_down_touch_id_;
base::OneShotTimer<LongPressAffordanceHandler> timer_;
- int tap_down_display_id_;
+ int64 tap_down_display_id_;
LongPressAnimationType current_animation_type_;
DISALLOW_COPY_AND_ASSIGN(LongPressAffordanceHandler);