| 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 Window* window = new Window(nullptr); | 171 Window* window = new Window(nullptr); |
| 172 SetWindowType(window, window_type); | 172 SetWindowType(window, window_type); |
| 173 window->Init(ui::LAYER_NOT_DRAWN); | 173 window->Init(ui::LAYER_NOT_DRAWN); |
| 174 return window; | 174 return window; |
| 175 } | 175 } |
| 176 | 176 |
| 177 void AuraTestBase::OnWmClientJankinessChanged( | 177 void AuraTestBase::OnWmClientJankinessChanged( |
| 178 const std::set<Window*>& client_windows, | 178 const std::set<Window*>& client_windows, |
| 179 bool janky) {} | 179 bool janky) {} |
| 180 | 180 |
| 181 void AuraTestBase::OnWmWillCreateDisplay(const display::Display& display) {} |
| 182 |
| 181 void AuraTestBase::OnWmNewDisplay( | 183 void AuraTestBase::OnWmNewDisplay( |
| 182 std::unique_ptr<WindowTreeHostMus> window_tree_host, | 184 std::unique_ptr<WindowTreeHostMus> window_tree_host, |
| 183 const display::Display& display) { | 185 const display::Display& display) { |
| 184 // Take ownership of the WindowTreeHost. | 186 // Take ownership of the WindowTreeHost. |
| 185 window_tree_host_mus_ = std::move(window_tree_host); | 187 window_tree_host_mus_ = std::move(window_tree_host); |
| 186 } | 188 } |
| 187 | 189 |
| 188 void AuraTestBase::OnWmDisplayRemoved(WindowTreeHostMus* window_tree_host) { | 190 void AuraTestBase::OnWmDisplayRemoved(WindowTreeHostMus* window_tree_host) { |
| 189 if (window_tree_host_mus_.get() == window_tree_host) | 191 if (window_tree_host_mus_.get() == window_tree_host) |
| 190 window_tree_host_mus_.reset(); | 192 window_tree_host_mus_.reset(); |
| 191 } | 193 } |
| 192 | 194 |
| 193 void AuraTestBase::OnWmDisplayModified(const display::Display& display) {} | 195 void AuraTestBase::OnWmDisplayModified(const display::Display& display) {} |
| 194 | 196 |
| 195 ui::mojom::EventResult AuraTestBase::OnAccelerator(uint32_t id, | 197 ui::mojom::EventResult AuraTestBase::OnAccelerator(uint32_t id, |
| 196 const ui::Event& event) { | 198 const ui::Event& event) { |
| 197 return ui::mojom::EventResult::HANDLED; | 199 return ui::mojom::EventResult::HANDLED; |
| 198 } | 200 } |
| 199 | 201 |
| 200 void AuraTestBase::OnWmPerformMoveLoop( | 202 void AuraTestBase::OnWmPerformMoveLoop( |
| 201 Window* window, | 203 Window* window, |
| 202 ui::mojom::MoveLoopSource source, | 204 ui::mojom::MoveLoopSource source, |
| 203 const gfx::Point& cursor_location, | 205 const gfx::Point& cursor_location, |
| 204 const base::Callback<void(bool)>& on_done) {} | 206 const base::Callback<void(bool)>& on_done) {} |
| 205 | 207 |
| 206 void AuraTestBase::OnWmCancelMoveLoop(Window* window) {} | 208 void AuraTestBase::OnWmCancelMoveLoop(Window* window) {} |
| 207 | 209 |
| 210 void AuraTestBase::OnWmSetClientArea( |
| 211 Window* window, |
| 212 const gfx::Insets& insets, |
| 213 const std::vector<gfx::Rect>& additional_client_areas) {} |
| 214 |
| 208 client::CaptureClient* AuraTestBase::GetCaptureClient() { | 215 client::CaptureClient* AuraTestBase::GetCaptureClient() { |
| 209 return helper_->capture_client(); | 216 return helper_->capture_client(); |
| 210 } | 217 } |
| 211 | 218 |
| 212 PropertyConverter* AuraTestBase::GetPropertyConverter() { | 219 PropertyConverter* AuraTestBase::GetPropertyConverter() { |
| 213 return &property_converter_; | 220 return &property_converter_; |
| 214 } | 221 } |
| 215 | 222 |
| 216 AuraTestBaseWithType::AuraTestBaseWithType() {} | 223 AuraTestBaseWithType::AuraTestBaseWithType() {} |
| 217 | 224 |
| 218 AuraTestBaseWithType::~AuraTestBaseWithType() { | 225 AuraTestBaseWithType::~AuraTestBaseWithType() { |
| 219 DCHECK(setup_called_); | 226 DCHECK(setup_called_); |
| 220 } | 227 } |
| 221 | 228 |
| 222 void AuraTestBaseWithType::SetUp() { | 229 void AuraTestBaseWithType::SetUp() { |
| 223 DCHECK(!setup_called_); | 230 DCHECK(!setup_called_); |
| 224 setup_called_ = true; | 231 setup_called_ = true; |
| 225 ConfigureBackend(GetParam()); | 232 ConfigureBackend(GetParam()); |
| 226 AuraTestBase::SetUp(); | 233 AuraTestBase::SetUp(); |
| 227 } | 234 } |
| 228 | 235 |
| 229 } // namespace test | 236 } // namespace test |
| 230 } // namespace aura | 237 } // namespace aura |
| OLD | NEW |