| 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_AURA_H_ | 5 #ifndef ASH_MUS_TEST_ASH_TEST_IMPL_AURA_H_ |
| 6 #define ASH_MUS_TEST_ASH_TEST_IMPL_AURA_H_ | 6 #define ASH_MUS_TEST_ASH_TEST_IMPL_AURA_H_ |
| 7 | 7 |
| 8 #include "ash/common/test/ash_test_impl.h" | 8 #include "ash/common/test/ash_test_impl.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| 11 namespace test { | 11 namespace test { |
| 12 class AshTestBase; | 12 class AshTestBase; |
| 13 } | 13 } |
| 14 | 14 |
| 15 // Implementation of AshTestImpl on top of aura. Implementation of AshTestImpl | 15 // Implementation of AshTestImpl on top of aura. Implementation of AshTestImpl |
| 16 // calls through to AshTestBase. | 16 // calls through to AshTestBase. |
| 17 class AshTestImplAura : public AshTestImpl { | 17 class AshTestImplAura : public AshTestImpl { |
| 18 public: | 18 public: |
| 19 AshTestImplAura(); | 19 AshTestImplAura(); |
| 20 ~AshTestImplAura() override; | 20 ~AshTestImplAura() override; |
| 21 | 21 |
| 22 // AshTestImpl: | 22 // AshTestImpl: |
| 23 void SetUp() override; | 23 void SetUp() override; |
| 24 void TearDown() override; | 24 void TearDown() override; |
| 25 bool SupportsMultipleDisplays() const override; | |
| 26 void UpdateDisplay(const std::string& display_spec) override; | 25 void UpdateDisplay(const std::string& display_spec) override; |
| 27 std::unique_ptr<WindowOwner> CreateTestWindow( | 26 std::unique_ptr<WindowOwner> CreateTestWindow( |
| 28 const gfx::Rect& bounds_in_screen, | 27 const gfx::Rect& bounds_in_screen, |
| 29 ui::wm::WindowType type, | 28 ui::wm::WindowType type, |
| 30 int shell_window_id) override; | 29 int shell_window_id) override; |
| 31 std::unique_ptr<WindowOwner> CreateToplevelTestWindow( | 30 std::unique_ptr<WindowOwner> CreateToplevelTestWindow( |
| 32 const gfx::Rect& bounds_in_screen, | 31 const gfx::Rect& bounds_in_screen, |
| 33 int shell_window_id) override; | 32 int shell_window_id) override; |
| 34 display::Display GetSecondaryDisplay() override; | 33 display::Display GetSecondaryDisplay() override; |
| 35 bool SetSecondaryDisplayPlacement( | 34 bool SetSecondaryDisplayPlacement( |
| 36 display::DisplayPlacement::Position position, | 35 display::DisplayPlacement::Position position, |
| 37 int offset) override; | 36 int offset) override; |
| 38 void ConfigureWidgetInitParamsForDisplay( | 37 void ConfigureWidgetInitParamsForDisplay( |
| 39 WmWindow* window, | 38 WmWindow* window, |
| 40 views::Widget::InitParams* init_params) override; | 39 views::Widget::InitParams* init_params) override; |
| 41 void AddTransientChild(WmWindow* parent, WmWindow* window) override; | 40 void AddTransientChild(WmWindow* parent, WmWindow* window) override; |
| 42 | 41 |
| 43 private: | 42 private: |
| 44 std::unique_ptr<test::AshTestBase> ash_test_base_; | 43 std::unique_ptr<test::AshTestBase> ash_test_base_; |
| 45 | 44 |
| 46 DISALLOW_COPY_AND_ASSIGN(AshTestImplAura); | 45 DISALLOW_COPY_AND_ASSIGN(AshTestImplAura); |
| 47 }; | 46 }; |
| 48 | 47 |
| 49 } // namespace ash | 48 } // namespace ash |
| 50 | 49 |
| 51 #endif // ASH_MUS_TEST_ASH_TEST_IMPL_AURA_H_ | 50 #endif // ASH_MUS_TEST_ASH_TEST_IMPL_AURA_H_ |
| OLD | NEW |