Chromium Code Reviews| Index: ui/aura/test/aura_test_base.cc |
| diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc |
| index 5a2f907eebc27902ff34813d6c1e74d637ffcaae..8498e38248bb06e80cb4f5ee004dca64d0110d7a 100644 |
| --- a/ui/aura/test/aura_test_base.cc |
| +++ b/ui/aura/test/aura_test_base.cc |
| @@ -7,6 +7,7 @@ |
| #include "ui/aura/client/window_parenting_client.h" |
| #include "ui/aura/mus/property_converter.h" |
| #include "ui/aura/mus/window_tree_client.h" |
| +#include "ui/aura/mus/window_tree_host_mus.h" |
| #include "ui/aura/test/test_window_delegate.h" |
| #include "ui/aura/window.h" |
| #include "ui/base/ime/input_method_initializer.h" |
| @@ -174,7 +175,8 @@ void AuraTestBase::SetPropertyConverter( |
| property_converter_ = std::move(helper); |
| } |
| -void AuraTestBase::OnEmbed(Window* root) {} |
| +void AuraTestBase::OnEmbed( |
| + std::unique_ptr<WindowTreeHostMus> window_tree_host) {} |
| void AuraTestBase::OnUnembed(Window* root) {} |
| @@ -207,8 +209,9 @@ void AuraTestBase::OnWmClientJankinessChanged( |
| const std::set<Window*>& client_windows, |
| bool janky) {} |
| -void AuraTestBase::OnWmNewDisplay(Window* window, |
| - const display::Display& display) {} |
| +void AuraTestBase::OnWmNewDisplay( |
| + std::unique_ptr<WindowTreeHostMus> window_tree_host, |
| + const display::Display& display) {} |
|
sadrul
2016/11/02 16:03:04
Is it OK to not keep the WTHMus alive?
sky
2016/11/02 16:53:23
It should be fine. But I'm assuming when a test wa
|
| void AuraTestBase::OnWmDisplayRemoved(Window* window) {} |