| 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 "ui/display/manager/display_manager.h" | 5 #include "ui/display/manager/display_manager.h" |
| 6 | 6 |
| 7 #include "ash/accelerators/accelerator_commands_aura.h" | 7 #include "ash/accelerators/accelerator_commands_aura.h" |
| 8 #include "ash/ash_switches.h" | 8 #include "ash/ash_switches.h" |
| 9 #include "ash/display/display_configuration_controller.h" | 9 #include "ash/display/display_configuration_controller.h" |
| 10 #include "ash/display/display_util.h" | 10 #include "ash/display/display_util.h" |
| 11 #include "ash/display/mirror_window_controller.h" | 11 #include "ash/display/mirror_window_controller.h" |
| 12 #include "ash/display/screen_orientation_controller_chromeos.h" | 12 #include "ash/display/screen_orientation_controller_chromeos.h" |
| 13 #include "ash/display/window_tree_host_manager.h" | 13 #include "ash/display/window_tree_host_manager.h" |
| 14 #include "ash/screen_util.h" | 14 #include "ash/screen_util.h" |
| 15 #include "ash/shared/app_types.h" | 15 #include "ash/shared/app_types.h" |
| 16 #include "ash/shell.h" | 16 #include "ash/shell.h" |
| 17 #include "ash/strings/grit/ash_strings.h" | 17 #include "ash/strings/grit/ash_strings.h" |
| 18 #include "ash/test/ash_test_base.h" | 18 #include "ash/test/ash_test_base.h" |
| 19 #include "ash/test/mirror_window_test_api.h" | 19 #include "ash/test/mirror_window_test_api.h" |
| 20 #include "ash/test/screen_orientation_controller_test_api.h" | 20 #include "ash/test/screen_orientation_controller_test_api.h" |
| 21 #include "ash/wm/maximize_mode/maximize_mode_controller.h" | 21 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
| 22 #include "ash/wm/window_state.h" | 22 #include "ash/wm/window_state.h" |
| 23 #include "ash/wm/window_state_aura.h" | |
| 24 #include "ash/wm/window_util.h" | 23 #include "ash/wm/window_util.h" |
| 25 #include "ash/wm_window.h" | 24 #include "ash/wm_window.h" |
| 26 #include "base/command_line.h" | 25 #include "base/command_line.h" |
| 27 #include "base/format_macros.h" | 26 #include "base/format_macros.h" |
| 28 #include "base/strings/string_number_conversions.h" | 27 #include "base/strings/string_number_conversions.h" |
| 29 #include "base/strings/stringprintf.h" | 28 #include "base/strings/stringprintf.h" |
| 30 #include "build/build_config.h" | 29 #include "build/build_config.h" |
| 31 #include "chromeos/accelerometer/accelerometer_reader.h" | 30 #include "chromeos/accelerometer/accelerometer_reader.h" |
| 32 #include "chromeos/accelerometer/accelerometer_types.h" | 31 #include "chromeos/accelerometer/accelerometer_types.h" |
| 33 #include "ui/aura/client/aura_constants.h" | 32 #include "ui/aura/client/aura_constants.h" |
| (...skipping 3175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3209 test_api.GetCurrentOrientation()); | 3208 test_api.GetCurrentOrientation()); |
| 3210 | 3209 |
| 3211 // The orientation has alraedy been locked to secondary once, so | 3210 // The orientation has alraedy been locked to secondary once, so |
| 3212 // it should swtich back to the portrait secondary. | 3211 // it should swtich back to the portrait secondary. |
| 3213 wm::ActivateWindow(window_ps); | 3212 wm::ActivateWindow(window_ps); |
| 3214 EXPECT_EQ(blink::kWebScreenOrientationLockPortraitSecondary, | 3213 EXPECT_EQ(blink::kWebScreenOrientationLockPortraitSecondary, |
| 3215 test_api.GetCurrentOrientation()); | 3214 test_api.GetCurrentOrientation()); |
| 3216 } | 3215 } |
| 3217 | 3216 |
| 3218 } // namespace ash | 3217 } // namespace ash |
| OLD | NEW |