| OLD | NEW |
| 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 #include "ash/drag_drop/drag_drop_controller.h" | 5 #include "ash/drag_drop/drag_drop_controller.h" |
| 6 | 6 |
| 7 #include "ash/drag_drop/drag_image_view.h" | 7 #include "ash/drag_drop/drag_image_view.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/wm/cursor_manager.h" | 9 #include "ash/wm/cursor_manager.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 DragCancel(); | 247 DragCancel(); |
| 248 break; | 248 break; |
| 249 default: | 249 default: |
| 250 return ui::TOUCH_STATUS_UNKNOWN; | 250 return ui::TOUCH_STATUS_UNKNOWN; |
| 251 } | 251 } |
| 252 return ui::TOUCH_STATUS_CONTINUE; | 252 return ui::TOUCH_STATUS_CONTINUE; |
| 253 } | 253 } |
| 254 | 254 |
| 255 ui::GestureStatus DragDropController::PreHandleGestureEvent( | 255 ui::GestureStatus DragDropController::PreHandleGestureEvent( |
| 256 aura::Window* target, | 256 aura::Window* target, |
| 257 ui::GestureEventImpl* event) { | 257 ui::GestureEvent* event) { |
| 258 return ui::GESTURE_STATUS_UNKNOWN; | 258 return ui::GESTURE_STATUS_UNKNOWN; |
| 259 } | 259 } |
| 260 | 260 |
| 261 void DragDropController::OnWindowDestroyed(aura::Window* window) { | 261 void DragDropController::OnWindowDestroyed(aura::Window* window) { |
| 262 if (drag_window_ == window) { | 262 if (drag_window_ == window) { |
| 263 drag_window_->RemoveObserver(this); | 263 drag_window_->RemoveObserver(this); |
| 264 drag_window_ = NULL; | 264 drag_window_ = NULL; |
| 265 } | 265 } |
| 266 } | 266 } |
| 267 | 267 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 295 void DragDropController::Cleanup() { | 295 void DragDropController::Cleanup() { |
| 296 if (drag_window_) | 296 if (drag_window_) |
| 297 drag_window_->RemoveObserver(this); | 297 drag_window_->RemoveObserver(this); |
| 298 drag_window_ = NULL; | 298 drag_window_ = NULL; |
| 299 drag_data_ = NULL; | 299 drag_data_ = NULL; |
| 300 drag_drop_in_progress_ = false; | 300 drag_drop_in_progress_ = false; |
| 301 } | 301 } |
| 302 | 302 |
| 303 } // namespace internal | 303 } // namespace internal |
| 304 } // namespace ash | 304 } // namespace ash |
| OLD | NEW |