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

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

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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/display/mouse_cursor_event_filter.cc ('k') | ash/drag_drop/drag_drop_controller.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_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 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "ui/aura/client/drag_drop_client.h" 10 #include "ui/aura/client/drag_drop_client.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 virtual gfx::NativeCursor GetDragCursor() OVERRIDE; 62 virtual gfx::NativeCursor GetDragCursor() OVERRIDE;
63 63
64 // Overridden from aura::EventFilter: 64 // Overridden from aura::EventFilter:
65 virtual bool PreHandleKeyEvent(aura::Window* target, 65 virtual bool PreHandleKeyEvent(aura::Window* target,
66 ui::KeyEvent* event) OVERRIDE; 66 ui::KeyEvent* event) OVERRIDE;
67 virtual bool PreHandleMouseEvent(aura::Window* target, 67 virtual bool PreHandleMouseEvent(aura::Window* target,
68 ui::MouseEvent* event) OVERRIDE; 68 ui::MouseEvent* event) OVERRIDE;
69 virtual ui::TouchStatus PreHandleTouchEvent( 69 virtual ui::TouchStatus PreHandleTouchEvent(
70 aura::Window* target, 70 aura::Window* target,
71 ui::TouchEvent* event) OVERRIDE; 71 ui::TouchEvent* event) OVERRIDE;
72 virtual ui::GestureStatus PreHandleGestureEvent( 72 virtual ui::EventResult PreHandleGestureEvent(
73 aura::Window* target, 73 aura::Window* target,
74 ui::GestureEvent* event) OVERRIDE; 74 ui::GestureEvent* event) OVERRIDE;
75 75
76 // Overridden from aura::WindowObserver. 76 // Overridden from aura::WindowObserver.
77 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 77 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
78 78
79 private: 79 private:
80 friend class ash::test::DragDropControllerTest; 80 friend class ash::test::DragDropControllerTest;
81 81
82 // Implementation of ImplicitAnimationObserver 82 // Implementation of ImplicitAnimationObserver
(...skipping 24 matching lines...) Expand all
107 107
108 scoped_ptr<ash::internal::DragDropTracker> drag_drop_tracker_; 108 scoped_ptr<ash::internal::DragDropTracker> drag_drop_tracker_;
109 109
110 DISALLOW_COPY_AND_ASSIGN(DragDropController); 110 DISALLOW_COPY_AND_ASSIGN(DragDropController);
111 }; 111 };
112 112
113 } // namespace internal 113 } // namespace internal
114 } // namespace ash 114 } // namespace ash
115 115
116 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 116 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/display/mouse_cursor_event_filter.cc ('k') | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698