| 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_drop_tracker.h" | 7 #include "ash/drag_drop/drag_drop_tracker.h" |
| 8 #include "ash/drag_drop/drag_image_view.h" | 8 #include "ash/drag_drop/drag_image_view.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/wm/coordinate_conversion.h" | 10 #include "ash/wm/coordinate_conversion.h" |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 break; | 254 break; |
| 255 case ui::ET_TOUCH_CANCELLED: | 255 case ui::ET_TOUCH_CANCELLED: |
| 256 DragCancel(); | 256 DragCancel(); |
| 257 break; | 257 break; |
| 258 default: | 258 default: |
| 259 return ui::TOUCH_STATUS_UNKNOWN; | 259 return ui::TOUCH_STATUS_UNKNOWN; |
| 260 } | 260 } |
| 261 return ui::TOUCH_STATUS_CONTINUE; | 261 return ui::TOUCH_STATUS_CONTINUE; |
| 262 } | 262 } |
| 263 | 263 |
| 264 ui::GestureStatus DragDropController::PreHandleGestureEvent( | 264 ui::EventResult DragDropController::PreHandleGestureEvent( |
| 265 aura::Window* target, | 265 aura::Window* target, |
| 266 ui::GestureEvent* event) { | 266 ui::GestureEvent* event) { |
| 267 return ui::GESTURE_STATUS_UNKNOWN; | 267 return ui::ER_UNHANDLED; |
| 268 } | 268 } |
| 269 | 269 |
| 270 void DragDropController::OnWindowDestroyed(aura::Window* window) { | 270 void DragDropController::OnWindowDestroyed(aura::Window* window) { |
| 271 if (drag_window_ == window) { | 271 if (drag_window_ == window) { |
| 272 drag_window_->RemoveObserver(this); | 272 drag_window_->RemoveObserver(this); |
| 273 drag_window_ = NULL; | 273 drag_window_ = NULL; |
| 274 } | 274 } |
| 275 } | 275 } |
| 276 | 276 |
| 277 //////////////////////////////////////////////////////////////////////////////// | 277 //////////////////////////////////////////////////////////////////////////////// |
| (...skipping 28 matching lines...) Expand all Loading... |
| 306 drag_window_->RemoveObserver(this); | 306 drag_window_->RemoveObserver(this); |
| 307 drag_window_ = NULL; | 307 drag_window_ = NULL; |
| 308 drag_data_ = NULL; | 308 drag_data_ = NULL; |
| 309 // Cleanup can be called again while deleting DragDropTracker, so use Pass | 309 // Cleanup can be called again while deleting DragDropTracker, so use Pass |
| 310 // instead of reset to avoid double free. | 310 // instead of reset to avoid double free. |
| 311 drag_drop_tracker_.Pass(); | 311 drag_drop_tracker_.Pass(); |
| 312 } | 312 } |
| 313 | 313 |
| 314 } // namespace internal | 314 } // namespace internal |
| 315 } // namespace ash | 315 } // namespace ash |
| OLD | NEW |