| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef ASH_COMMON_TEST_ASH_TEST_H_ | 5 #ifndef ASH_COMMON_TEST_ASH_TEST_H_ |
| 6 #define ASH_COMMON_TEST_ASH_TEST_H_ | 6 #define ASH_COMMON_TEST_ASH_TEST_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 ~AshTest() override; | 66 ~AshTest() override; |
| 67 | 67 |
| 68 // Returns the WmShelf for the primary display. | 68 // Returns the WmShelf for the primary display. |
| 69 static WmShelf* GetPrimaryShelf(); | 69 static WmShelf* GetPrimaryShelf(); |
| 70 | 70 |
| 71 // Returns the system tray on the primary display. | 71 // Returns the system tray on the primary display. |
| 72 static SystemTray* GetPrimarySystemTray(); | 72 static SystemTray* GetPrimarySystemTray(); |
| 73 | 73 |
| 74 static test::TestSystemTrayDelegate* GetSystemTrayDelegate(); | 74 static test::TestSystemTrayDelegate* GetSystemTrayDelegate(); |
| 75 | 75 |
| 76 bool SupportsMultipleDisplays() const; | |
| 77 | |
| 78 // Update the display configuration as given in |display_spec|. | 76 // Update the display configuration as given in |display_spec|. |
| 79 // See test::DisplayManagerTestApi::UpdateDisplay for more details. | 77 // See test::DisplayManagerTestApi::UpdateDisplay for more details. |
| 80 void UpdateDisplay(const std::string& display_spec); | 78 void UpdateDisplay(const std::string& display_spec); |
| 81 | 79 |
| 82 // Creates a visible window in the appropriate container. If | 80 // Creates a visible window in the appropriate container. If |
| 83 // |bounds_in_screen| is empty the window is added to the primary root | 81 // |bounds_in_screen| is empty the window is added to the primary root |
| 84 // window, otherwise the window is added to the display matching | 82 // window, otherwise the window is added to the display matching |
| 85 // |bounds_in_screen|. |shell_window_id| is the shell window id to give to | 83 // |bounds_in_screen|. |shell_window_id| is the shell window id to give to |
| 86 // the new window. | 84 // the new window. |
| 87 std::unique_ptr<WindowOwner> CreateTestWindow( | 85 std::unique_ptr<WindowOwner> CreateTestWindow( |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 | 140 |
| 143 private: | 141 private: |
| 144 std::unique_ptr<AshTestImpl> test_impl_; | 142 std::unique_ptr<AshTestImpl> test_impl_; |
| 145 | 143 |
| 146 DISALLOW_COPY_AND_ASSIGN(AshTest); | 144 DISALLOW_COPY_AND_ASSIGN(AshTest); |
| 147 }; | 145 }; |
| 148 | 146 |
| 149 } // namespace ash | 147 } // namespace ash |
| 150 | 148 |
| 151 #endif // ASH_COMMON_TEST_ASH_TEST_H_ | 149 #endif // ASH_COMMON_TEST_ASH_TEST_H_ |
| OLD | NEW |