| 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 { |
| (...skipping 10 matching lines...) Expand all Loading... |
| 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; | 25 bool SupportsMultipleDisplays() const override; |
| 26 void UpdateDisplay(const std::string& display_spec) override; | 26 void UpdateDisplay(const std::string& display_spec) override; |
| 27 std::unique_ptr<WindowOwner> CreateTestWindow( | 27 std::unique_ptr<WindowOwner> CreateTestWindow( |
| 28 const gfx::Rect& bounds_in_screen, | 28 const gfx::Rect& bounds_in_screen, |
| 29 ui::wm::WindowType type, | 29 ui::wm::WindowType type, |
| 30 int shell_window_id) override; | 30 int shell_window_id) override; |
| 31 std::unique_ptr<WindowOwner> CreateToplevelTestWindow( |
| 32 const gfx::Rect& bounds_in_screen, |
| 33 int shell_window_id) override; |
| 31 display::Display GetSecondaryDisplay() override; | 34 display::Display GetSecondaryDisplay() override; |
| 32 bool SetSecondaryDisplayPlacement( | 35 bool SetSecondaryDisplayPlacement( |
| 33 display::DisplayPlacement::Position position, | 36 display::DisplayPlacement::Position position, |
| 34 int offset) override; | 37 int offset) override; |
| 38 void ConfigureWidgetInitParamsForDisplay( |
| 39 WmWindow* window, |
| 40 views::Widget::InitParams* init_params) override; |
| 41 void AddTransientChild(WmWindow* parent, WmWindow* window) override; |
| 35 | 42 |
| 36 private: | 43 private: |
| 37 std::unique_ptr<test::AshTestBase> ash_test_base_; | 44 std::unique_ptr<test::AshTestBase> ash_test_base_; |
| 38 | 45 |
| 39 DISALLOW_COPY_AND_ASSIGN(AshTestImplAura); | 46 DISALLOW_COPY_AND_ASSIGN(AshTestImplAura); |
| 40 }; | 47 }; |
| 41 | 48 |
| 42 } // namespace ash | 49 } // namespace ash |
| 43 | 50 |
| 44 #endif // ASH_MUS_TEST_ASH_TEST_IMPL_AURA_H_ | 51 #endif // ASH_MUS_TEST_ASH_TEST_IMPL_AURA_H_ |
| OLD | NEW |