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 f571fb3cbc6543c545485bcfb5f05bce88f33e45..e2636700ec85fdea9ed3d8e857710a3813e74a2b 100644 |
| --- a/ui/aura/test/aura_test_base.cc |
| +++ b/ui/aura/test/aura_test_base.cc |
| @@ -5,6 +5,7 @@ |
| #include "ui/aura/test/aura_test_base.h" |
| #include "ui/aura/client/window_parenting_client.h" |
| +#include "ui/aura/mus/property_utils.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" |
| @@ -165,8 +166,12 @@ bool AuraTestBase::OnWmSetProperty( |
| } |
| Window* AuraTestBase::OnWmCreateTopLevelWindow( |
| + const ui::mojom::WindowType* window_type, |
| std::map<std::string, std::vector<uint8_t>>* properties) { |
| - return new Window(nullptr); |
| + Window* window = new Window(nullptr); |
| + if (window_type) |
|
msw
2016/11/21 19:26:47
This seems a bit strange, should we allow a window
sky
2016/11/21 22:13:56
Added UNKNOWN.
|
| + SetWindowType(window, *window_type); |
| + return window; |
| } |
| void AuraTestBase::OnWmClientJankinessChanged( |