| 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/display/screen_position_controller.h" | 5 #include "ash/display/screen_position_controller.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "ash/common/shell_window_ids.h" | 9 #include "ash/common/shell_window_ids.h" |
| 10 #include "ash/display/display_manager.h" | 10 #include "ash/display/display_manager.h" |
| 11 #include "ash/screen_util.h" | 11 #include "ash/screen_util.h" |
| 12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 13 #include "ash/test/ash_test_base.h" | 13 #include "ash/test/ash_test_base.h" |
| 14 #include "ash/test/shell_test_api.h" | 14 #include "ash/test/shell_test_api.h" |
| 15 #include "ui/aura/env.h" | 15 #include "ui/aura/env.h" |
| 16 #include "ui/aura/test/test_window_delegate.h" | 16 #include "ui/aura/test/test_window_delegate.h" |
| 17 #include "ui/aura/window_tracker.h" | 17 #include "ui/aura/window_tracker.h" |
| 18 #include "ui/aura/window_tree_host.h" | 18 #include "ui/aura/window_tree_host.h" |
| 19 #include "ui/base/layout.h" | 19 #include "ui/base/layout.h" |
| 20 #include "ui/display/manager/display_layout.h" | 20 #include "ui/display/manager/display_layout.h" |
| 21 #include "ui/display/screen.h" | 21 #include "ui/display/screen.h" |
| 22 #include "ui/events/test/event_generator.h" | 22 #include "ui/events/test/event_generator.h" |
| 23 | 23 |
| 24 #if defined(OS_WIN) | 24 #if defined(OS_WIN) |
| 25 // TODO(scottmg): RootWindow doesn't get resized immediately on Windows | 25 // TODO(scottmg): RootWindow doesn't get resized immediately on Windows |
| 26 // Ash. http://crbug.com/247916. | 26 // Ash. http://crbug.com/247916. |
| 27 #define MAYBE_ConvertHostPointToScreen DISABLED_ConvertHostPointToScreen | 27 #define MAYBE_ConvertHostPointToScreen DISABLED_ConvertHostPointToScreen |
| 28 #define MAYBE_ConvertHostPointToScreenHiDPI DISABLED_ConvertHostPointToScreenHiD
PI | 28 #define MAYBE_ConvertHostPointToScreenHiDPI \ |
| 29 #define MAYBE_ConvertHostPointToScreenRotate DISABLED_ConvertHostPointToScreenRo
tate | 29 DISABLED_ConvertHostPointToScreenHiDPI |
| 30 #define MAYBE_ConvertHostPointToScreenUIScale DISABLED_ConvertHostPointToScreenU
IScale | 30 #define MAYBE_ConvertHostPointToScreenRotate \ |
| 31 DISABLED_ConvertHostPointToScreenRotate |
| 32 #define MAYBE_ConvertHostPointToScreenUIScale \ |
| 33 DISABLED_ConvertHostPointToScreenUIScale |
| 31 #define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \ | 34 #define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \ |
| 32 DISABLED_ConvertToScreenWhileRemovingSecondaryDisplay | 35 DISABLED_ConvertToScreenWhileRemovingSecondaryDisplay |
| 33 #else | 36 #else |
| 34 #define MAYBE_ConvertHostPointToScreen ConvertHostPointToScreen | 37 #define MAYBE_ConvertHostPointToScreen ConvertHostPointToScreen |
| 35 #define MAYBE_ConvertHostPointToScreenHiDPI ConvertHostPointToScreenHiDPI | 38 #define MAYBE_ConvertHostPointToScreenHiDPI ConvertHostPointToScreenHiDPI |
| 36 #define MAYBE_ConvertHostPointToScreenRotate ConvertHostPointToScreenRotate | 39 #define MAYBE_ConvertHostPointToScreenRotate ConvertHostPointToScreenRotate |
| 37 #define MAYBE_ConvertHostPointToScreenUIScale ConvertHostPointToScreenUIScale | 40 #define MAYBE_ConvertHostPointToScreenUIScale ConvertHostPointToScreenUIScale |
| 38 #define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \ | 41 #define MAYBE_ConvertToScreenWhileRemovingSecondaryDisplay \ |
| 39 ConvertToScreenWhileRemovingSecondaryDisplay | 42 ConvertToScreenWhileRemovingSecondaryDisplay |
| 40 #endif | 43 #endif |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 // destroyed. | 361 // destroyed. |
| 359 EXPECT_FALSE(tracker.Contains(root_windows[1])); | 362 EXPECT_FALSE(tracker.Contains(root_windows[1])); |
| 360 | 363 |
| 361 // Check that we could convert all of the mouse events we got to screen | 364 // Check that we could convert all of the mouse events we got to screen |
| 362 // coordinates. | 365 // coordinates. |
| 363 EXPECT_TRUE(event_handler->could_convert_to_screen()); | 366 EXPECT_TRUE(event_handler->could_convert_to_screen()); |
| 364 } | 367 } |
| 365 | 368 |
| 366 } // namespace test | 369 } // namespace test |
| 367 } // namespace ash | 370 } // namespace ash |
| OLD | NEW |