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

Side by Side Diff: ash/drag_drop/drag_drop_controller.h

Issue 9221014: aura: Gesture event plumbing (skeleton). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 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
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_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 5 #ifndef ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
6 #define ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 6 #define ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "ui/aura/client/drag_drop_client.h" 10 #include "ui/aura/client/drag_drop_client.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 virtual void DragCancel() OVERRIDE; 55 virtual void DragCancel() OVERRIDE;
56 virtual bool IsDragDropInProgress() OVERRIDE; 56 virtual bool IsDragDropInProgress() OVERRIDE;
57 57
58 // Overridden from aura::EventFilter: 58 // Overridden from aura::EventFilter:
59 virtual bool PreHandleKeyEvent(aura::Window* target, 59 virtual bool PreHandleKeyEvent(aura::Window* target,
60 aura::KeyEvent* event) OVERRIDE; 60 aura::KeyEvent* event) OVERRIDE;
61 virtual bool PreHandleMouseEvent(aura::Window* target, 61 virtual bool PreHandleMouseEvent(aura::Window* target,
62 aura::MouseEvent* event) OVERRIDE; 62 aura::MouseEvent* event) OVERRIDE;
63 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, 63 virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
64 aura::TouchEvent* event) OVERRIDE; 64 aura::TouchEvent* event) OVERRIDE;
65 virtual ui::GestureStatus PreHandleGestureEvent(aura::Window* target,
sky 2012/01/17 17:18:35 nit: put on next line.
sadrul 2012/01/17 17:25:36 Done.
66 aura::GestureEvent* event) OVERRIDE;
65 67
66 private: 68 private:
67 friend class ash::test::DragDropControllerTest; 69 friend class ash::test::DragDropControllerTest;
68 70
69 // Overridden from ui::LayerAnimationObserver: 71 // Overridden from ui::LayerAnimationObserver:
70 virtual void OnLayerAnimationEnded( 72 virtual void OnLayerAnimationEnded(
71 const ui::LayerAnimationSequence* sequence) OVERRIDE; 73 const ui::LayerAnimationSequence* sequence) OVERRIDE;
72 virtual void OnLayerAnimationAborted( 74 virtual void OnLayerAnimationAborted(
73 const ui::LayerAnimationSequence* sequence) OVERRIDE; 75 const ui::LayerAnimationSequence* sequence) OVERRIDE;
74 virtual void OnLayerAnimationScheduled( 76 virtual void OnLayerAnimationScheduled(
(...skipping 17 matching lines...) Expand all
92 // Only be used for tests. 94 // Only be used for tests.
93 bool should_block_during_drag_drop_; 95 bool should_block_during_drag_drop_;
94 96
95 DISALLOW_COPY_AND_ASSIGN(DragDropController); 97 DISALLOW_COPY_AND_ASSIGN(DragDropController);
96 }; 98 };
97 99
98 } // namespace internal 100 } // namespace internal
99 } // namespace ash 101 } // namespace ash
100 102
101 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 103 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698