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

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

Issue 11364062: ui: Remove TouchStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 virtual void Drop(aura::Window* target, 58 virtual void Drop(aura::Window* target,
59 const ui::LocatedEvent& event) OVERRIDE; 59 const ui::LocatedEvent& event) OVERRIDE;
60 virtual void DragCancel() OVERRIDE; 60 virtual void DragCancel() OVERRIDE;
61 virtual bool IsDragDropInProgress() OVERRIDE; 61 virtual bool IsDragDropInProgress() OVERRIDE;
62 62
63 // Overridden from aura::EventFilter: 63 // Overridden from aura::EventFilter:
64 virtual bool PreHandleKeyEvent(aura::Window* target, 64 virtual bool PreHandleKeyEvent(aura::Window* target,
65 ui::KeyEvent* event) OVERRIDE; 65 ui::KeyEvent* event) OVERRIDE;
66 virtual bool PreHandleMouseEvent(aura::Window* target, 66 virtual bool PreHandleMouseEvent(aura::Window* target,
67 ui::MouseEvent* event) OVERRIDE; 67 ui::MouseEvent* event) OVERRIDE;
68 virtual ui::TouchStatus PreHandleTouchEvent( 68 virtual ui::EventResult PreHandleTouchEvent(
69 aura::Window* target, 69 aura::Window* target,
70 ui::TouchEvent* event) OVERRIDE; 70 ui::TouchEvent* event) OVERRIDE;
71 virtual ui::EventResult PreHandleGestureEvent( 71 virtual ui::EventResult PreHandleGestureEvent(
72 aura::Window* target, 72 aura::Window* target,
73 ui::GestureEvent* event) OVERRIDE; 73 ui::GestureEvent* event) OVERRIDE;
74 74
75 // Overridden from aura::WindowObserver. 75 // Overridden from aura::WindowObserver.
76 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 76 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
77 77
78 private: 78 private:
(...skipping 26 matching lines...) Expand all
105 105
106 scoped_ptr<ash::internal::DragDropTracker> drag_drop_tracker_; 106 scoped_ptr<ash::internal::DragDropTracker> drag_drop_tracker_;
107 107
108 DISALLOW_COPY_AND_ASSIGN(DragDropController); 108 DISALLOW_COPY_AND_ASSIGN(DragDropController);
109 }; 109 };
110 110
111 } // namespace internal 111 } // namespace internal
112 } // namespace ash 112 } // namespace ash
113 113
114 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 114 #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