Chromium Code Reviews| Index: ash/test/shell_test_api.cc |
| diff --git a/ash/test/shell_test_api.cc b/ash/test/shell_test_api.cc |
| index 8c8293c4f9eb088522a151751330807de86fbe76..4f5435751cf389208665d1ef295710b635dafeb0 100644 |
| --- a/ash/test/shell_test_api.cc |
| +++ b/ash/test/shell_test_api.cc |
| @@ -3,7 +3,7 @@ |
| // found in the LICENSE file. |
| #include "ash/test/shell_test_api.h" |
| - |
| +#include "ash/common/palette_delegate.h" |
|
msw
2017/03/09 21:57:20
q: can we skip this for just assigning/moving the
|
| #include "ash/common/session/session_state_delegate.h" |
| #include "ash/display/display_configuration_controller.h" |
| #include "ash/root_window_controller.h" |
| @@ -12,6 +12,8 @@ |
| namespace ash { |
| namespace test { |
| +ShellTestApi::ShellTestApi() : ShellTestApi(Shell::GetInstance()) {} |
| + |
| ShellTestApi::ShellTestApi(Shell* shell) : shell_(shell) {} |
| SystemGestureEventFilter* ShellTestApi::system_gesture_event_filter() { |
| @@ -38,6 +40,11 @@ void ShellTestApi::DisableDisplayAnimator() { |
| shell_->display_configuration_controller()->ResetAnimatorForTest(); |
| } |
| +void ShellTestApi::SetPaletteDelegate( |
| + std::unique_ptr<PaletteDelegate> palette_delegate) { |
| + shell_->palette_delegate_ = std::move(palette_delegate); |
| +} |
| + |
| void ShellTestApi::SetSessionStateDelegate( |
| SessionStateDelegate* session_state_delegate) { |
| shell_->session_state_delegate_.reset(session_state_delegate); |