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

Side by Side Diff: ash/wm/gestures/long_press_affordance_handler.h

Issue 11189005: Fix display id type in long press affordance handler. Currently, the affordance (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_ 5 #ifndef ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_
6 #define ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_ 6 #define ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_
7 7
8 #include "base/timer.h" 8 #include "base/timer.h"
9 #include "ui/base/animation/animation_delegate.h" 9 #include "ui/base/animation/animation_delegate.h"
10 #include "ui/base/animation/linear_animation.h" 10 #include "ui/base/animation/linear_animation.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 virtual bool ShouldSendCanceledFromStop() OVERRIDE; 61 virtual bool ShouldSendCanceledFromStop() OVERRIDE;
62 62
63 // Overridden from ui::AnimationDelegate. 63 // Overridden from ui::AnimationDelegate.
64 virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE; 64 virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
65 65
66 class LongPressAffordanceView; 66 class LongPressAffordanceView;
67 scoped_ptr<LongPressAffordanceView> view_; 67 scoped_ptr<LongPressAffordanceView> view_;
68 gfx::Point tap_down_location_; 68 gfx::Point tap_down_location_;
69 int tap_down_touch_id_; 69 int tap_down_touch_id_;
70 base::OneShotTimer<LongPressAffordanceHandler> timer_; 70 base::OneShotTimer<LongPressAffordanceHandler> timer_;
71 int tap_down_display_id_; 71 int64 tap_down_display_id_;
72 LongPressAnimationType current_animation_type_; 72 LongPressAnimationType current_animation_type_;
73 73
74 DISALLOW_COPY_AND_ASSIGN(LongPressAffordanceHandler); 74 DISALLOW_COPY_AND_ASSIGN(LongPressAffordanceHandler);
75 }; 75 };
76 76
77 } // namespace internal 77 } // namespace internal
78 } // namespace ash 78 } // namespace ash
79 79
80 #endif // ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_ 80 #endif // ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698