| 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/test/ash_test_impl_aura.h" | 5 #include "ash/test/ash_test_impl_aura.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 "ash/screen_util.h" | 9 #include "ash/screen_util.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 AshTestImplAura::~AshTestImplAura() {} | 44 AshTestImplAura::~AshTestImplAura() {} |
| 45 | 45 |
| 46 void AshTestImplAura::SetUp() { | 46 void AshTestImplAura::SetUp() { |
| 47 ash_test_base_->SetUp(); | 47 ash_test_base_->SetUp(); |
| 48 } | 48 } |
| 49 | 49 |
| 50 void AshTestImplAura::TearDown() { | 50 void AshTestImplAura::TearDown() { |
| 51 ash_test_base_->TearDown(); | 51 ash_test_base_->TearDown(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 bool AshTestImplAura::SupportsMultipleDisplays() const { | |
| 55 return ash_test_base_->SupportsMultipleDisplays(); | |
| 56 } | |
| 57 | |
| 58 void AshTestImplAura::UpdateDisplay(const std::string& display_spec) { | 54 void AshTestImplAura::UpdateDisplay(const std::string& display_spec) { |
| 59 ash_test_base_->UpdateDisplay(display_spec); | 55 ash_test_base_->UpdateDisplay(display_spec); |
| 60 } | 56 } |
| 61 | 57 |
| 62 std::unique_ptr<WindowOwner> AshTestImplAura::CreateTestWindow( | 58 std::unique_ptr<WindowOwner> AshTestImplAura::CreateTestWindow( |
| 63 const gfx::Rect& bounds_in_screen, | 59 const gfx::Rect& bounds_in_screen, |
| 64 ui::wm::WindowType type, | 60 ui::wm::WindowType type, |
| 65 int shell_window_id) { | 61 int shell_window_id) { |
| 66 return base::MakeUnique<WindowOwner>( | 62 return base::MakeUnique<WindowOwner>( |
| 67 WmWindow::Get(ash_test_base_->CreateTestWindowInShellWithDelegateAndType( | 63 WmWindow::Get(ash_test_base_->CreateTestWindowInShellWithDelegateAndType( |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 ::wm::AddTransientChild(WmWindow::GetAuraWindow(parent), | 98 ::wm::AddTransientChild(WmWindow::GetAuraWindow(parent), |
| 103 WmWindow::GetAuraWindow(window)); | 99 WmWindow::GetAuraWindow(window)); |
| 104 } | 100 } |
| 105 | 101 |
| 106 // static | 102 // static |
| 107 std::unique_ptr<AshTestImpl> AshTestImpl::Create() { | 103 std::unique_ptr<AshTestImpl> AshTestImpl::Create() { |
| 108 return base::MakeUnique<AshTestImplAura>(); | 104 return base::MakeUnique<AshTestImplAura>(); |
| 109 } | 105 } |
| 110 | 106 |
| 111 } // namespace ash | 107 } // namespace ash |
| OLD | NEW |