| 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/common/test/ash_test.h" | 5 #include "ash/common/test/ash_test.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/wm_shelf.h" | 7 #include "ash/common/shelf/wm_shelf.h" |
| 8 #include "ash/common/system/status_area_widget.h" | 8 #include "ash/common/system/status_area_widget.h" |
| 9 #include "ash/common/test/ash_test_impl.h" | 9 #include "ash/common/test/ash_test_impl.h" |
| 10 #include "ash/common/test/test_session_state_delegate.h" | 10 #include "ash/common/test/test_session_state_delegate.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 SystemTray* AshTest::GetPrimarySystemTray() { | 41 SystemTray* AshTest::GetPrimarySystemTray() { |
| 42 return GetPrimaryShelf()->GetStatusAreaWidget()->system_tray(); | 42 return GetPrimaryShelf()->GetStatusAreaWidget()->system_tray(); |
| 43 } | 43 } |
| 44 | 44 |
| 45 // static | 45 // static |
| 46 test::TestSystemTrayDelegate* AshTest::GetSystemTrayDelegate() { | 46 test::TestSystemTrayDelegate* AshTest::GetSystemTrayDelegate() { |
| 47 return static_cast<test::TestSystemTrayDelegate*>( | 47 return static_cast<test::TestSystemTrayDelegate*>( |
| 48 WmShell::Get()->system_tray_delegate()); | 48 WmShell::Get()->system_tray_delegate()); |
| 49 } | 49 } |
| 50 | 50 |
| 51 bool AshTest::SupportsMultipleDisplays() const { | |
| 52 return test_impl_->SupportsMultipleDisplays(); | |
| 53 } | |
| 54 | |
| 55 void AshTest::UpdateDisplay(const std::string& display_spec) { | 51 void AshTest::UpdateDisplay(const std::string& display_spec) { |
| 56 return test_impl_->UpdateDisplay(display_spec); | 52 return test_impl_->UpdateDisplay(display_spec); |
| 57 } | 53 } |
| 58 | 54 |
| 59 std::unique_ptr<WindowOwner> AshTest::CreateTestWindow(const gfx::Rect& bounds, | 55 std::unique_ptr<WindowOwner> AshTest::CreateTestWindow(const gfx::Rect& bounds, |
| 60 ui::wm::WindowType type, | 56 ui::wm::WindowType type, |
| 61 int shell_window_id) { | 57 int shell_window_id) { |
| 62 return test_impl_->CreateTestWindow(bounds, type, shell_window_id); | 58 return test_impl_->CreateTestWindow(bounds, type, shell_window_id); |
| 63 } | 59 } |
| 64 | 60 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 | 130 |
| 135 void AshTest::SetUp() { | 131 void AshTest::SetUp() { |
| 136 test_impl_->SetUp(); | 132 test_impl_->SetUp(); |
| 137 } | 133 } |
| 138 | 134 |
| 139 void AshTest::TearDown() { | 135 void AshTest::TearDown() { |
| 140 test_impl_->TearDown(); | 136 test_impl_->TearDown(); |
| 141 } | 137 } |
| 142 | 138 |
| 143 } // namespace ash | 139 } // namespace ash |
| OLD | NEW |