| 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/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 void Reset() { | 156 void Reset() { |
| 157 drag_start_received_ = false; | 157 drag_start_received_ = false; |
| 158 num_drag_updates_ = 0; | 158 num_drag_updates_ = 0; |
| 159 drop_received_ = false; | 159 drop_received_ = false; |
| 160 drag_canceled_ = false; | 160 drag_canceled_ = false; |
| 161 drag_string_.clear(); | 161 drag_string_.clear(); |
| 162 } | 162 } |
| 163 | 163 |
| 164 virtual int StartDragAndDrop( | 164 virtual int StartDragAndDrop( |
| 165 const ui::OSExchangeData& data, | 165 const ui::OSExchangeData& data, |
| 166 aura::RootWindow* root_window, | 166 aura::Window* root_window, |
| 167 aura::Window* source_window, | 167 aura::Window* source_window, |
| 168 const gfx::Point& location, | 168 const gfx::Point& location, |
| 169 int operation, | 169 int operation, |
| 170 ui::DragDropTypes::DragEventSource source) OVERRIDE { | 170 ui::DragDropTypes::DragEventSource source) OVERRIDE { |
| 171 drag_start_received_ = true; | 171 drag_start_received_ = true; |
| 172 data.GetString(&drag_string_); | 172 data.GetString(&drag_string_); |
| 173 return DragDropController::StartDragAndDrop( | 173 return DragDropController::StartDragAndDrop( |
| 174 data, root_window, source_window, location, operation, source); | 174 data, root_window, source_window, location, operation, source); |
| 175 } | 175 } |
| 176 | 176 |
| (...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1099 EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString()); | 1099 EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString()); |
| 1100 } | 1100 } |
| 1101 for (Shell::RootWindowList::iterator iter = root_windows.begin(); | 1101 for (Shell::RootWindowList::iterator iter = root_windows.begin(); |
| 1102 iter != root_windows.end(); ++iter) { | 1102 iter != root_windows.end(); ++iter) { |
| 1103 aura::client::SetDragDropClient(*iter, NULL); | 1103 aura::client::SetDragDropClient(*iter, NULL); |
| 1104 } | 1104 } |
| 1105 } | 1105 } |
| 1106 | 1106 |
| 1107 } // namespace test | 1107 } // namespace test |
| 1108 } // namespace aura | 1108 } // namespace aura |
| OLD | NEW |