Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/aura/test/aura_test_base.h" | 5 #include "ui/aura/test/aura_test_base.h" |
| 6 | 6 |
| 7 #include "ui/aura/client/window_parenting_client.h" | 7 #include "ui/aura/client/window_parenting_client.h" |
| 8 #include "ui/aura/mus/property_utils.h" | |
| 8 #include "ui/aura/mus/window_tree_client.h" | 9 #include "ui/aura/mus/window_tree_client.h" |
| 9 #include "ui/aura/mus/window_tree_host_mus.h" | 10 #include "ui/aura/mus/window_tree_host_mus.h" |
| 10 #include "ui/aura/test/test_window_delegate.h" | 11 #include "ui/aura/test/test_window_delegate.h" |
| 11 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 12 #include "ui/base/ime/input_method_initializer.h" | 13 #include "ui/base/ime/input_method_initializer.h" |
| 13 #include "ui/base/material_design/material_design_controller.h" | 14 #include "ui/base/material_design/material_design_controller.h" |
| 14 #include "ui/base/test/material_design_controller_test_api.h" | 15 #include "ui/base/test/material_design_controller_test_api.h" |
| 15 #include "ui/compositor/test/context_factories_for_test.h" | 16 #include "ui/compositor/test/context_factories_for_test.h" |
| 16 #include "ui/events/event_dispatcher.h" | 17 #include "ui/events/event_dispatcher.h" |
| 17 #include "ui/events/event_processor.h" | 18 #include "ui/events/event_processor.h" |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 158 } | 159 } |
| 159 | 160 |
| 160 bool AuraTestBase::OnWmSetProperty( | 161 bool AuraTestBase::OnWmSetProperty( |
| 161 Window* window, | 162 Window* window, |
| 162 const std::string& name, | 163 const std::string& name, |
| 163 std::unique_ptr<std::vector<uint8_t>>* new_data) { | 164 std::unique_ptr<std::vector<uint8_t>>* new_data) { |
| 164 return true; | 165 return true; |
| 165 } | 166 } |
| 166 | 167 |
| 167 Window* AuraTestBase::OnWmCreateTopLevelWindow( | 168 Window* AuraTestBase::OnWmCreateTopLevelWindow( |
| 169 const ui::mojom::WindowType* window_type, | |
| 168 std::map<std::string, std::vector<uint8_t>>* properties) { | 170 std::map<std::string, std::vector<uint8_t>>* properties) { |
| 169 return new Window(nullptr); | 171 Window* window = new Window(nullptr); |
| 172 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.
| |
| 173 SetWindowType(window, *window_type); | |
| 174 return window; | |
| 170 } | 175 } |
| 171 | 176 |
| 172 void AuraTestBase::OnWmClientJankinessChanged( | 177 void AuraTestBase::OnWmClientJankinessChanged( |
| 173 const std::set<Window*>& client_windows, | 178 const std::set<Window*>& client_windows, |
| 174 bool janky) {} | 179 bool janky) {} |
| 175 | 180 |
| 176 void AuraTestBase::OnWmNewDisplay( | 181 void AuraTestBase::OnWmNewDisplay( |
| 177 std::unique_ptr<WindowTreeHostMus> window_tree_host, | 182 std::unique_ptr<WindowTreeHostMus> window_tree_host, |
| 178 const display::Display& display) { | 183 const display::Display& display) { |
| 179 // Take ownership of the WindowTreeHost. | 184 // Take ownership of the WindowTreeHost. |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 213 | 218 |
| 214 void AuraTestBaseWithType::SetUp() { | 219 void AuraTestBaseWithType::SetUp() { |
| 215 DCHECK(!setup_called_); | 220 DCHECK(!setup_called_); |
| 216 setup_called_ = true; | 221 setup_called_ = true; |
| 217 ConfigureBackend(GetParam()); | 222 ConfigureBackend(GetParam()); |
| 218 AuraTestBase::SetUp(); | 223 AuraTestBase::SetUp(); |
| 219 } | 224 } |
| 220 | 225 |
| 221 } // namespace test | 226 } // namespace test |
| 222 } // namespace aura | 227 } // namespace aura |
| OLD | NEW |