OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_orientation_controller_chromeos.h" | 5 #include "ash/display/screen_orientation_controller_chromeos.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/common/ash_switches.h" | 10 #include "ash/common/ash_switches.h" |
11 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" | 11 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
12 #include "ash/common/wm_shell.h" | 12 #include "ash/common/wm_shell.h" |
13 #include "ash/content/shell_content_state.h" | 13 #include "ash/content/shell_content_state.h" |
14 #include "ash/display/display_manager.h" | 14 #include "ash/display/display_manager.h" |
15 #include "ash/shell.h" | 15 #include "ash/shell.h" |
16 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
17 #include "ash/test/ash_test_environment_content.h" | |
18 #include "ash/test/ash_test_helper.h" | 17 #include "ash/test/ash_test_helper.h" |
19 #include "ash/test/content/test_shell_content_state.h" | 18 #include "ash/test/content/test_shell_content_state.h" |
20 #include "ash/test/display_manager_test_api.h" | 19 #include "ash/test/display_manager_test_api.h" |
21 #include "ash/test/test_shell_delegate.h" | 20 #include "ash/test/test_shell_delegate.h" |
22 #include "ash/test/test_system_tray_delegate.h" | 21 #include "ash/test/test_system_tray_delegate.h" |
23 #include "base/command_line.h" | 22 #include "base/command_line.h" |
24 #include "chromeos/accelerometer/accelerometer_reader.h" | 23 #include "chromeos/accelerometer/accelerometer_reader.h" |
25 #include "chromeos/accelerometer/accelerometer_types.h" | 24 #include "chromeos/accelerometer/accelerometer_types.h" |
26 #include "content/public/browser/browser_context.h" | 25 #include "content/public/browser/browser_context.h" |
27 #include "content/public/browser/web_contents.h" | 26 #include "content/public/browser/web_contents.h" |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 } | 101 } |
103 | 102 |
104 } // namespace | 103 } // namespace |
105 | 104 |
106 class ScreenOrientationControllerTest : public test::AshTestBase { | 105 class ScreenOrientationControllerTest : public test::AshTestBase { |
107 public: | 106 public: |
108 ScreenOrientationControllerTest(); | 107 ScreenOrientationControllerTest(); |
109 ~ScreenOrientationControllerTest() override; | 108 ~ScreenOrientationControllerTest() override; |
110 | 109 |
111 content::ScreenOrientationDelegate* delegate() { | 110 content::ScreenOrientationDelegate* delegate() { |
112 test::AshTestEnvironmentContent* test_environment_content = | 111 return ash_test_helper() |
113 static_cast<test::AshTestEnvironmentContent*>( | 112 ->test_shell_content_state() |
114 ash_test_helper()->ash_test_environment()); | |
115 return test_environment_content->test_shell_content_state() | |
116 ->screen_orientation_delegate(); | 113 ->screen_orientation_delegate(); |
117 } | 114 } |
118 | 115 |
119 // Creates and initializes and empty content::WebContents that is backed by a | 116 // Creates and initializes and empty content::WebContents that is backed by a |
120 // content::BrowserContext and that has an aura::Window. | 117 // content::BrowserContext and that has an aura::Window. |
121 content::WebContents* CreateWebContents(); | 118 content::WebContents* CreateWebContents(); |
122 | 119 |
123 // Creates a secondary content::WebContents, with a separate | 120 // Creates a secondary content::WebContents, with a separate |
124 // content::BrowserContext. | 121 // content::BrowserContext. |
125 content::WebContents* CreateSecondaryWebContents(); | 122 content::WebContents* CreateSecondaryWebContents(); |
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
654 | 651 |
655 Shell::GetInstance()->screen_orientation_controller()->SetDisplayRotation( | 652 Shell::GetInstance()->screen_orientation_controller()->SetDisplayRotation( |
656 kNewRotation, display::Display::ROTATION_SOURCE_ACTIVE); | 653 kNewRotation, display::Display::ROTATION_SOURCE_ACTIVE); |
657 | 654 |
658 EXPECT_EQ( | 655 EXPECT_EQ( |
659 kNewRotation, | 656 kNewRotation, |
660 display_manager->GetDisplayInfo(kInternalDisplayId).GetActiveRotation()); | 657 display_manager->GetDisplayInfo(kInternalDisplayId).GetActiveRotation()); |
661 } | 658 } |
662 | 659 |
663 } // namespace ash | 660 } // namespace ash |
OLD | NEW |