| 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 | 149 |
| 150 void AuraTestBase::OnEmbedRootDestroyed(Window* root) {} | 150 void AuraTestBase::OnEmbedRootDestroyed(Window* root) {} |
| 151 | 151 |
| 152 void AuraTestBase::OnLostConnection(WindowTreeClient* client) {} | 152 void AuraTestBase::OnLostConnection(WindowTreeClient* client) {} |
| 153 | 153 |
| 154 void AuraTestBase::OnPointerEventObserved(const ui::PointerEvent& event, | 154 void AuraTestBase::OnPointerEventObserved(const ui::PointerEvent& event, |
| 155 Window* target) {} | 155 Window* target) {} |
| 156 | 156 |
| 157 void AuraTestBase::SetWindowManagerClient(WindowManagerClient* client) {} | 157 void AuraTestBase::SetWindowManagerClient(WindowManagerClient* client) {} |
| 158 | 158 |
| 159 bool AuraTestBase::OnWmSetBounds(Window* window, gfx::Rect* bounds) { | 159 void AuraTestBase::OnWmSetBounds(Window* window, const gfx::Rect& bounds) {} |
| 160 return true; | |
| 161 } | |
| 162 | 160 |
| 163 bool AuraTestBase::OnWmSetProperty( | 161 bool AuraTestBase::OnWmSetProperty( |
| 164 Window* window, | 162 Window* window, |
| 165 const std::string& name, | 163 const std::string& name, |
| 166 std::unique_ptr<std::vector<uint8_t>>* new_data) { | 164 std::unique_ptr<std::vector<uint8_t>>* new_data) { |
| 167 return true; | 165 return true; |
| 168 } | 166 } |
| 169 | 167 |
| 170 Window* AuraTestBase::OnWmCreateTopLevelWindow( | 168 Window* AuraTestBase::OnWmCreateTopLevelWindow( |
| 171 ui::mojom::WindowType window_type, | 169 ui::mojom::WindowType window_type, |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 | 234 |
| 237 void AuraTestBaseWithType::SetUp() { | 235 void AuraTestBaseWithType::SetUp() { |
| 238 DCHECK(!setup_called_); | 236 DCHECK(!setup_called_); |
| 239 setup_called_ = true; | 237 setup_called_ = true; |
| 240 ConfigureBackend(GetParam()); | 238 ConfigureBackend(GetParam()); |
| 241 AuraTestBase::SetUp(); | 239 AuraTestBase::SetUp(); |
| 242 } | 240 } |
| 243 | 241 |
| 244 } // namespace test | 242 } // namespace test |
| 245 } // namespace aura | 243 } // namespace aura |
| OLD | NEW |