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 994 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1005 gfx::Point window_location_on_destroying() const { | 1005 gfx::Point window_location_on_destroying() const { |
1006 return window_location_on_destroying_; | 1006 return window_location_on_destroying_; |
1007 } | 1007 } |
1008 | 1008 |
1009 public: | 1009 public: |
1010 gfx::Point window_location_on_destroying_; | 1010 gfx::Point window_location_on_destroying_; |
1011 }; | 1011 }; |
1012 | 1012 |
1013 } | 1013 } |
1014 | 1014 |
1015 #if defined(OS_WIN) | |
1016 // Multiple displays are not supported on Windows Ash. http://crbug.com/165962 | |
1017 #define MAYBE_DragCancelAcrossDisplays DISABLED_DragCancelAcrossDisplays | |
1018 #else | |
1019 #define MAYBE_DragCancelAcrossDisplays DragCancelAcrossDisplays | |
1020 #endif | |
1021 | |
1022 // Verifies the drag image moves back to the position where drag is started | 1015 // Verifies the drag image moves back to the position where drag is started |
1023 // across displays when drag is cancelled. | 1016 // across displays when drag is cancelled. |
1024 TEST_F(DragDropControllerTest, MAYBE_DragCancelAcrossDisplays) { | 1017 TEST_F(DragDropControllerTest, DragCancelAcrossDisplays) { |
| 1018 if (!SupportsMultipleDisplays()) |
| 1019 return; |
| 1020 |
1025 UpdateDisplay("400x400,400x400"); | 1021 UpdateDisplay("400x400,400x400"); |
1026 Shell::RootWindowList root_windows = | 1022 Shell::RootWindowList root_windows = |
1027 Shell::GetInstance()->GetAllRootWindows(); | 1023 Shell::GetInstance()->GetAllRootWindows(); |
1028 for (Shell::RootWindowList::iterator iter = root_windows.begin(); | 1024 for (Shell::RootWindowList::iterator iter = root_windows.begin(); |
1029 iter != root_windows.end(); ++iter) { | 1025 iter != root_windows.end(); ++iter) { |
1030 aura::client::SetDragDropClient(*iter, drag_drop_controller_.get()); | 1026 aura::client::SetDragDropClient(*iter, drag_drop_controller_.get()); |
1031 } | 1027 } |
1032 | 1028 |
1033 ui::OSExchangeData data; | 1029 ui::OSExchangeData data; |
1034 data.SetString(UTF8ToUTF16("I am being dragged")); | 1030 data.SetString(UTF8ToUTF16("I am being dragged")); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1103 EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString()); | 1099 EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString()); |
1104 } | 1100 } |
1105 for (Shell::RootWindowList::iterator iter = root_windows.begin(); | 1101 for (Shell::RootWindowList::iterator iter = root_windows.begin(); |
1106 iter != root_windows.end(); ++iter) { | 1102 iter != root_windows.end(); ++iter) { |
1107 aura::client::SetDragDropClient(*iter, NULL); | 1103 aura::client::SetDragDropClient(*iter, NULL); |
1108 } | 1104 } |
1109 } | 1105 } |
1110 | 1106 |
1111 } // namespace test | 1107 } // namespace test |
1112 } // namespace aura | 1108 } // namespace aura |
OLD | NEW |