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/property_utils.h" |
9 #include "ui/aura/mus/window_tree_client.h" | 9 #include "ui/aura/mus/window_tree_client.h" |
10 #include "ui/aura/mus/window_tree_host_mus.h" | 10 #include "ui/aura/mus/window_tree_host_mus.h" |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 return true; | 162 return true; |
163 } | 163 } |
164 | 164 |
165 bool AuraTestBase::OnWmSetProperty( | 165 bool AuraTestBase::OnWmSetProperty( |
166 Window* window, | 166 Window* window, |
167 const std::string& name, | 167 const std::string& name, |
168 std::unique_ptr<std::vector<uint8_t>>* new_data) { | 168 std::unique_ptr<std::vector<uint8_t>>* new_data) { |
169 return true; | 169 return true; |
170 } | 170 } |
171 | 171 |
| 172 void AuraTestBase::OnWmSetModalType(Window* window, ui::ModalType type) {} |
| 173 |
172 void AuraTestBase::OnWmSetCanFocus(Window* window, bool can_focus) {} | 174 void AuraTestBase::OnWmSetCanFocus(Window* window, bool can_focus) {} |
173 | 175 |
174 Window* AuraTestBase::OnWmCreateTopLevelWindow( | 176 Window* AuraTestBase::OnWmCreateTopLevelWindow( |
175 ui::mojom::WindowType window_type, | 177 ui::mojom::WindowType window_type, |
176 std::map<std::string, std::vector<uint8_t>>* properties) { | 178 std::map<std::string, std::vector<uint8_t>>* properties) { |
177 Window* window = new Window(nullptr); | 179 Window* window = new Window(nullptr); |
178 SetWindowType(window, window_type); | 180 SetWindowType(window, window_type); |
179 window->Init(ui::LAYER_NOT_DRAWN); | 181 window->Init(ui::LAYER_NOT_DRAWN); |
180 return window; | 182 return window; |
181 } | 183 } |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
249 | 251 |
250 AuraTestBaseMus::~AuraTestBaseMus() {} | 252 AuraTestBaseMus::~AuraTestBaseMus() {} |
251 | 253 |
252 void AuraTestBaseMus::SetUp() { | 254 void AuraTestBaseMus::SetUp() { |
253 ConfigureBackend(test::BackendType::MUS); | 255 ConfigureBackend(test::BackendType::MUS); |
254 AuraTestBase::SetUp(); | 256 AuraTestBase::SetUp(); |
255 } | 257 } |
256 | 258 |
257 } // namespace test | 259 } // namespace test |
258 } // namespace aura | 260 } // namespace aura |
OLD | NEW |