| 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 #include "ash/mus/test/ash_test_impl_mus.h" | 5 #include "ash/mus/test/ash_test_impl_mus.h" |
| 6 | 6 |
| 7 #include "ash/common/test/ash_test.h" | 7 #include "ash/common/test/ash_test.h" |
| 8 #include "ash/common/wm_window.h" | 8 #include "ash/common/wm_window.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "services/ui/public/cpp/property_type_converters.h" | 10 #include "services/ui/public/cpp/property_type_converters.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 AshTestImplMus::~AshTestImplMus() {} | 39 AshTestImplMus::~AshTestImplMus() {} |
| 40 | 40 |
| 41 void AshTestImplMus::SetUp() { | 41 void AshTestImplMus::SetUp() { |
| 42 wm_test_base_->SetUp(); | 42 wm_test_base_->SetUp(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 void AshTestImplMus::TearDown() { | 45 void AshTestImplMus::TearDown() { |
| 46 wm_test_base_->TearDown(); | 46 wm_test_base_->TearDown(); |
| 47 } | 47 } |
| 48 | 48 |
| 49 bool AshTestImplMus::SupportsMultipleDisplays() const { | |
| 50 return wm_test_base_->SupportsMultipleDisplays(); | |
| 51 } | |
| 52 | |
| 53 void AshTestImplMus::UpdateDisplay(const std::string& display_spec) { | 49 void AshTestImplMus::UpdateDisplay(const std::string& display_spec) { |
| 54 wm_test_base_->UpdateDisplay(display_spec); | 50 wm_test_base_->UpdateDisplay(display_spec); |
| 55 } | 51 } |
| 56 | 52 |
| 57 std::unique_ptr<WindowOwner> AshTestImplMus::CreateTestWindow( | 53 std::unique_ptr<WindowOwner> AshTestImplMus::CreateTestWindow( |
| 58 const gfx::Rect& bounds_in_screen, | 54 const gfx::Rect& bounds_in_screen, |
| 59 ui::wm::WindowType type, | 55 ui::wm::WindowType type, |
| 60 int shell_window_id) { | 56 int shell_window_id) { |
| 61 WmWindow* window = | 57 WmWindow* window = |
| 62 WmWindow::Get(wm_test_base_->CreateTestWindow(bounds_in_screen, type)); | 58 WmWindow::Get(wm_test_base_->CreateTestWindow(bounds_in_screen, type)); |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 } | 97 } |
| 102 | 98 |
| 103 } // namespace mus | 99 } // namespace mus |
| 104 | 100 |
| 105 // static | 101 // static |
| 106 std::unique_ptr<AshTestImpl> AshTestImpl::Create() { | 102 std::unique_ptr<AshTestImpl> AshTestImpl::Create() { |
| 107 return base::MakeUnique<mus::AshTestImplMus>(); | 103 return base::MakeUnique<mus::AshTestImplMus>(); |
| 108 } | 104 } |
| 109 | 105 |
| 110 } // namespace ash | 106 } // namespace ash |
| OLD | NEW |