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_MUS_TEST_ASH_TEST_IMPL_MUS_H_ | 5 #ifndef ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_ |
6 #define ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_ | 6 #define ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_ |
7 | 7 |
8 #include "ash/common/test/ash_test_impl.h" | 8 #include "ash/common/test/ash_test_impl.h" |
9 #include "ash/mus/test/wm_test_base.h" | 9 #include "ash/mus/test/wm_test_base.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 | 22 |
23 // AshTestImpl: | 23 // AshTestImpl: |
24 void SetUp() override; | 24 void SetUp() override; |
25 void TearDown() override; | 25 void TearDown() override; |
26 bool SupportsMultipleDisplays() const override; | 26 bool SupportsMultipleDisplays() const override; |
27 void UpdateDisplay(const std::string& display_spec) override; | 27 void UpdateDisplay(const std::string& display_spec) override; |
28 std::unique_ptr<WindowOwner> CreateTestWindow( | 28 std::unique_ptr<WindowOwner> CreateTestWindow( |
29 const gfx::Rect& bounds_in_screen, | 29 const gfx::Rect& bounds_in_screen, |
30 ui::wm::WindowType type, | 30 ui::wm::WindowType type, |
31 int shell_window_id) override; | 31 int shell_window_id) override; |
| 32 std::unique_ptr<WindowOwner> CreateToplevelTestWindow( |
| 33 const gfx::Rect& bounds_in_screen, |
| 34 int shell_window_id) override; |
32 display::Display GetSecondaryDisplay() override; | 35 display::Display GetSecondaryDisplay() override; |
33 bool SetSecondaryDisplayPlacement( | 36 bool SetSecondaryDisplayPlacement( |
34 display::DisplayPlacement::Position position, | 37 display::DisplayPlacement::Position position, |
35 int offset) override; | 38 int offset) override; |
| 39 void ConfigureWidgetInitParamsForDisplay( |
| 40 WmWindow* window, |
| 41 views::Widget::InitParams* init_params) override; |
| 42 void AddTransientChild(WmWindow* parent, WmWindow* window) override; |
36 | 43 |
37 private: | 44 private: |
38 // TODO(sky): fold WmTestBase directly into this class when no more subclasses | 45 // TODO(sky): fold WmTestBase directly into this class when no more subclasses |
39 // of WmTestBase. | 46 // of WmTestBase. |
40 std::unique_ptr<WmTestBase> wm_test_base_; | 47 std::unique_ptr<WmTestBase> wm_test_base_; |
41 | 48 |
42 DISALLOW_COPY_AND_ASSIGN(AshTestImplMus); | 49 DISALLOW_COPY_AND_ASSIGN(AshTestImplMus); |
43 }; | 50 }; |
44 | 51 |
45 } // namespace mus | 52 } // namespace mus |
46 } // namespace ash | 53 } // namespace ash |
47 | 54 |
48 #endif // ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_ | 55 #endif // ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_ |
OLD | NEW |