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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « ash/wm/event_client_impl.h ('k') | ash/wm/gestures/long_press_affordance_handler.cc » ('j') | 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/timer.h" 8 #include "base/timer/timer.h"
9 #include "ui/aura/window_observer.h" 9 #include "ui/aura/window_observer.h"
10 #include "ui/gfx/animation/linear_animation.h" 10 #include "ui/gfx/animation/linear_animation.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 NONE, 45 NONE,
46 GROW_ANIMATION, 46 GROW_ANIMATION,
47 SHRINK_ANIMATION, 47 SHRINK_ANIMATION,
48 }; 48 };
49 49
50 void StartAnimation(); 50 void StartAnimation();
51 void StopAffordance(); 51 void StopAffordance();
52 void SetTapDownTarget(aura::Window* target); 52 void SetTapDownTarget(aura::Window* target);
53 53
54 // Overridden from gfx::LinearAnimation. 54 // Overridden from gfx::LinearAnimation.
55 virtual void AnimateToState(double state) OVERRIDE; 55 virtual void AnimateToState(double state) override;
56 virtual void AnimationStopped() OVERRIDE; 56 virtual void AnimationStopped() override;
57 57
58 // Overridden from aura::WindowObserver. 58 // Overridden from aura::WindowObserver.
59 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 59 virtual void OnWindowDestroying(aura::Window* window) override;
60 60
61 scoped_ptr<LongPressAffordanceView> view_; 61 scoped_ptr<LongPressAffordanceView> view_;
62 gfx::Point tap_down_location_; 62 gfx::Point tap_down_location_;
63 base::OneShotTimer<LongPressAffordanceHandler> timer_; 63 base::OneShotTimer<LongPressAffordanceHandler> timer_;
64 aura::Window* tap_down_target_; 64 aura::Window* tap_down_target_;
65 LongPressAnimationType current_animation_type_; 65 LongPressAnimationType current_animation_type_;
66 66
67 DISALLOW_COPY_AND_ASSIGN(LongPressAffordanceHandler); 67 DISALLOW_COPY_AND_ASSIGN(LongPressAffordanceHandler);
68 }; 68 };
69 69
70 } // namespace ash 70 } // namespace ash
71 71
72 #endif // ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_ 72 #endif // ASH_WM_GESTURES_LONG_PRESS_AFFORDANCE_HANDLER_H_
OLDNEW
« no previous file with comments | « ash/wm/event_client_impl.h ('k') | ash/wm/gestures/long_press_affordance_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698