Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "services/ui/ws/test_utils.h" | 5 #include "services/ui/ws/test_utils.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "cc/output/copy_output_request.h" | 10 #include "cc/output/copy_output_request.h" |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 148 | 148 |
| 149 std::unique_ptr<PlatformDisplay> | 149 std::unique_ptr<PlatformDisplay> |
| 150 TestPlatformDisplayFactory::CreatePlatformDisplay( | 150 TestPlatformDisplayFactory::CreatePlatformDisplay( |
| 151 const PlatformDisplayInitParams& init_params) { | 151 const PlatformDisplayInitParams& init_params) { |
| 152 return base::MakeUnique<TestPlatformDisplay>(init_params, cursor_storage_); | 152 return base::MakeUnique<TestPlatformDisplay>(init_params, cursor_storage_); |
| 153 } | 153 } |
| 154 | 154 |
| 155 // TestFrameGeneratorDelegate ------------------------------------------------- | 155 // TestFrameGeneratorDelegate ------------------------------------------------- |
| 156 | 156 |
| 157 TestFrameGeneratorDelegate::TestFrameGeneratorDelegate( | 157 TestFrameGeneratorDelegate::TestFrameGeneratorDelegate( |
| 158 ServerWindow* root_window) | 158 ServerWindow* root_window) |
|
Fady Samuel
2017/01/24 20:43:28
Remove this?
Saman Sami
2017/01/24 21:13:12
Done.
| |
| 159 : root_window_(root_window) {} | 159 : root_window_(root_window) {} |
| 160 | 160 |
| 161 TestFrameGeneratorDelegate::~TestFrameGeneratorDelegate() {} | 161 TestFrameGeneratorDelegate::~TestFrameGeneratorDelegate() {} |
| 162 | 162 |
| 163 ServerWindow* TestFrameGeneratorDelegate::GetActiveRootWindow() { | |
| 164 return root_window_; | |
| 165 } | |
| 166 | |
| 167 bool TestFrameGeneratorDelegate::IsInHighContrastMode() { | 163 bool TestFrameGeneratorDelegate::IsInHighContrastMode() { |
| 168 return false; | 164 return false; |
| 169 } | 165 } |
| 170 | 166 |
| 171 // WindowTreeTestApi --------------------------------------------------------- | 167 // WindowTreeTestApi --------------------------------------------------------- |
| 172 | 168 |
| 173 WindowTreeTestApi::WindowTreeTestApi(WindowTree* tree) : tree_(tree) {} | 169 WindowTreeTestApi::WindowTreeTestApi(WindowTree* tree) : tree_(tree) {} |
| 174 WindowTreeTestApi::~WindowTreeTestApi() {} | 170 WindowTreeTestApi::~WindowTreeTestApi() {} |
| 175 | 171 |
| 176 void WindowTreeTestApi::StartPointerWatcher(bool want_moves) { | 172 void WindowTreeTestApi::StartPointerWatcher(bool want_moves) { |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 633 return nullptr; | 629 return nullptr; |
| 634 if (!tree->AddWindow(parent_client_id, client_window_id)) | 630 if (!tree->AddWindow(parent_client_id, client_window_id)) |
| 635 return nullptr; | 631 return nullptr; |
| 636 *client_id = client_window_id; | 632 *client_id = client_window_id; |
| 637 return tree->GetWindowByClientId(client_window_id); | 633 return tree->GetWindowByClientId(client_window_id); |
| 638 } | 634 } |
| 639 | 635 |
| 640 } // namespace test | 636 } // namespace test |
| 641 } // namespace ws | 637 } // namespace ws |
| 642 } // namespace ui | 638 } // namespace ui |
| OLD | NEW |