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

Side by Side Diff: ash/wm/system_gesture_event_filter.h

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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 | « ash/wm/session_state_animator.cc ('k') | ash/wm/window_animations.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_SYSTEM_GESTURE_EVENT_FILTER_H_ 5 #ifndef ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_
6 #define ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_ 6 #define ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_
7 7
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/touch/touch_uma.h" 9 #include "ash/touch/touch_uma.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
11 #include "ui/aura/window_observer.h" 11 #include "ui/aura/window_observer.h"
12 #include "ui/base/animation/animation_delegate.h"
13 #include "ui/base/animation/linear_animation.h"
14 #include "ui/base/events/event_handler.h" 12 #include "ui/base/events/event_handler.h"
15 #include "ui/gfx/point.h" 13 #include "ui/gfx/point.h"
16 14
17 #include <map> 15 #include <map>
18 16
19 namespace aura { 17 namespace aura {
20 class Window; 18 class Window;
21 } 19 }
22 20
23 namespace ui { 21 namespace ui {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 scoped_ptr<LongPressAffordanceHandler> long_press_affordance_; 67 scoped_ptr<LongPressAffordanceHandler> long_press_affordance_;
70 scoped_ptr<TwoFingerDragHandler> two_finger_drag_; 68 scoped_ptr<TwoFingerDragHandler> two_finger_drag_;
71 69
72 DISALLOW_COPY_AND_ASSIGN(SystemGestureEventFilter); 70 DISALLOW_COPY_AND_ASSIGN(SystemGestureEventFilter);
73 }; 71 };
74 72
75 } // namespace internal 73 } // namespace internal
76 } // namespace ash 74 } // namespace ash
77 75
78 #endif // ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_ 76 #endif // ASH_WM_SYSTEM_GESTURE_EVENT_FILTER_H_
OLDNEW
« no previous file with comments | « ash/wm/session_state_animator.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698