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

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

Issue 11570012: events: Update key-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-for-landing Created 8 years 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/accelerators/accelerator_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 "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 int operation, 58 int operation,
59 ui::DragDropTypes::DragEventSource source) OVERRIDE; 59 ui::DragDropTypes::DragEventSource source) OVERRIDE;
60 virtual void DragUpdate(aura::Window* target, 60 virtual void DragUpdate(aura::Window* target,
61 const ui::LocatedEvent& event) OVERRIDE; 61 const ui::LocatedEvent& event) OVERRIDE;
62 virtual void Drop(aura::Window* target, 62 virtual void Drop(aura::Window* target,
63 const ui::LocatedEvent& event) OVERRIDE; 63 const ui::LocatedEvent& event) OVERRIDE;
64 virtual void DragCancel() OVERRIDE; 64 virtual void DragCancel() OVERRIDE;
65 virtual bool IsDragDropInProgress() OVERRIDE; 65 virtual bool IsDragDropInProgress() OVERRIDE;
66 66
67 // Overridden from ui::EventHandler: 67 // Overridden from ui::EventHandler:
68 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 68 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
69 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 69 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
70 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 70 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
71 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 71 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
72 72
73 // Overridden from aura::WindowObserver. 73 // Overridden from aura::WindowObserver.
74 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 74 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
75 75
76 protected: 76 protected:
77 // Helper method to create a LinearAnimation object that will run the drag 77 // Helper method to create a LinearAnimation object that will run the drag
78 // cancel animation. Caller take ownership of the returned object. Protected 78 // cancel animation. Caller take ownership of the returned object. Protected
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 136
137 base::WeakPtrFactory<DragDropController> weak_factory_; 137 base::WeakPtrFactory<DragDropController> weak_factory_;
138 138
139 DISALLOW_COPY_AND_ASSIGN(DragDropController); 139 DISALLOW_COPY_AND_ASSIGN(DragDropController);
140 }; 140 };
141 141
142 } // namespace internal 142 } // namespace internal
143 } // namespace ash 143 } // namespace ash
144 144
145 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_ 145 #endif // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_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