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

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

Issue 11269022: Add Vector2d classes that represent offsets, instead of using Point. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: RenderText fixup 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
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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 // Implementation of ImplicitAnimationObserver 81 // Implementation of ImplicitAnimationObserver
82 virtual void OnImplicitAnimationsCompleted() OVERRIDE; 82 virtual void OnImplicitAnimationsCompleted() OVERRIDE;
83 83
84 // Helper method to start drag widget flying back animation. 84 // Helper method to start drag widget flying back animation.
85 void StartCanceledAnimation(); 85 void StartCanceledAnimation();
86 86
87 // Helper method to reset everything. 87 // Helper method to reset everything.
88 void Cleanup(); 88 void Cleanup();
89 89
90 scoped_ptr<DragImageView> drag_image_; 90 scoped_ptr<DragImageView> drag_image_;
91 gfx::Point drag_image_offset_; 91 gfx::Vector2d drag_image_offset_;
92 const ui::OSExchangeData* drag_data_; 92 const ui::OSExchangeData* drag_data_;
93 int drag_operation_; 93 int drag_operation_;
94 94
95 // Window that is currently under the drag cursor. 95 // Window that is currently under the drag cursor.
96 aura::Window* drag_window_; 96 aura::Window* drag_window_;
97 gfx::Point drag_start_location_; 97 gfx::Point drag_start_location_;
98 98
99 // 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.
100 // Only be used for tests. 100 // Only be used for tests.
101 bool should_block_during_drag_drop_; 101 bool should_block_during_drag_drop_;
102 102
103 // Closure for quitting nested message loop. 103 // Closure for quitting nested message loop.
104 base::Closure quit_closure_; 104 base::Closure quit_closure_;
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

Powered by Google App Engine
This is Rietveld 408576698