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

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

Issue 10919135: Move ash specific cursor code to CursorManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 virtual int StartDragAndDrop(const ui::OSExchangeData& data, 52 virtual int StartDragAndDrop(const ui::OSExchangeData& data,
53 aura::RootWindow* root_window, 53 aura::RootWindow* root_window,
54 const gfx::Point& root_location, 54 const gfx::Point& root_location,
55 int operation) OVERRIDE; 55 int operation) OVERRIDE;
56 virtual void DragUpdate(aura::Window* target, 56 virtual void DragUpdate(aura::Window* target,
57 const ui::LocatedEvent& event) OVERRIDE; 57 const ui::LocatedEvent& event) OVERRIDE;
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 virtual gfx::NativeCursor GetDragCursor() OVERRIDE;
63 62
64 // Overridden from aura::EventFilter: 63 // Overridden from aura::EventFilter:
65 virtual bool PreHandleKeyEvent(aura::Window* target, 64 virtual bool PreHandleKeyEvent(aura::Window* target,
66 ui::KeyEvent* event) OVERRIDE; 65 ui::KeyEvent* event) OVERRIDE;
67 virtual bool PreHandleMouseEvent(aura::Window* target, 66 virtual bool PreHandleMouseEvent(aura::Window* target,
68 ui::MouseEvent* event) OVERRIDE; 67 ui::MouseEvent* event) OVERRIDE;
69 virtual ui::TouchStatus PreHandleTouchEvent( 68 virtual ui::TouchStatus PreHandleTouchEvent(
70 aura::Window* target, 69 aura::Window* target,
71 ui::TouchEvent* event) OVERRIDE; 70 ui::TouchEvent* event) OVERRIDE;
72 virtual ui::EventResult PreHandleGestureEvent( 71 virtual ui::EventResult PreHandleGestureEvent(
(...skipping 12 matching lines...) Expand all
85 // Helper method to start drag widget flying back animation. 84 // Helper method to start drag widget flying back animation.
86 void StartCanceledAnimation(); 85 void StartCanceledAnimation();
87 86
88 // Helper method to reset everything. 87 // Helper method to reset everything.
89 void Cleanup(); 88 void Cleanup();
90 89
91 scoped_ptr<DragImageView> drag_image_; 90 scoped_ptr<DragImageView> drag_image_;
92 gfx::Point drag_image_offset_; 91 gfx::Point drag_image_offset_;
93 const ui::OSExchangeData* drag_data_; 92 const ui::OSExchangeData* drag_data_;
94 int drag_operation_; 93 int drag_operation_;
95 gfx::NativeCursor drag_cursor_;
96 94
97 // Window that is currently under the drag cursor. 95 // Window that is currently under the drag cursor.
98 aura::Window* drag_window_; 96 aura::Window* drag_window_;
99 gfx::Point drag_start_location_; 97 gfx::Point drag_start_location_;
100 98
101 // Indicates whether the caller should be blocked on a drag/drop session. 99 // Indicates whether the caller should be blocked on a drag/drop session.
102 // Only be used for tests. 100 // Only be used for tests.
103 bool should_block_during_drag_drop_; 101 bool should_block_during_drag_drop_;
104 102
105 // Closure for quitting nested message loop. 103 // Closure for quitting nested message loop.
106 base::Closure quit_closure_; 104 base::Closure quit_closure_;
107 105
108 scoped_ptr<ash::internal::DragDropTracker> drag_drop_tracker_; 106 scoped_ptr<ash::internal::DragDropTracker> drag_drop_tracker_;
109 107
110 DISALLOW_COPY_AND_ASSIGN(DragDropController); 108 DISALLOW_COPY_AND_ASSIGN(DragDropController);
111 }; 109 };
112 110
113 } // namespace internal 111 } // namespace internal
114 } // namespace ash 112 } // namespace ash
115 113
116 #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