| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 return false; | 57 return false; |
| 58 display_metrics_ = metrics; | 58 display_metrics_ = metrics; |
| 59 return true; | 59 return true; |
| 60 } | 60 } |
| 61 const display::ViewportMetrics& GetViewportMetrics() const override { | 61 const display::ViewportMetrics& GetViewportMetrics() const override { |
| 62 return display_metrics_; | 62 return display_metrics_; |
| 63 } | 63 } |
| 64 bool IsPrimaryDisplay() const override { return is_primary_; } | 64 bool IsPrimaryDisplay() const override { return is_primary_; } |
| 65 void OnGpuChannelEstablished( | 65 void OnGpuChannelEstablished( |
| 66 scoped_refptr<gpu::GpuChannelHost> host) override {} | 66 scoped_refptr<gpu::GpuChannelHost> host) override {} |
| 67 FrameGenerator* GetFrameGenerator() override { return nullptr; } |
| 67 | 68 |
| 68 private: | 69 private: |
| 69 display::ViewportMetrics display_metrics_; | 70 display::ViewportMetrics display_metrics_; |
| 70 | 71 |
| 71 int64_t id_; | 72 int64_t id_; |
| 72 bool is_primary_; | 73 bool is_primary_; |
| 73 mojom::Cursor* cursor_storage_; | 74 mojom::Cursor* cursor_storage_; |
| 74 | 75 |
| 75 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay); | 76 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay); |
| 76 }; | 77 }; |
| (...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 return nullptr; | 577 return nullptr; |
| 577 if (!tree->AddWindow(parent_client_id, client_window_id)) | 578 if (!tree->AddWindow(parent_client_id, client_window_id)) |
| 578 return nullptr; | 579 return nullptr; |
| 579 *client_id = client_window_id; | 580 *client_id = client_window_id; |
| 580 return tree->GetWindowByClientId(client_window_id); | 581 return tree->GetWindowByClientId(client_window_id); |
| 581 } | 582 } |
| 582 | 583 |
| 583 } // namespace test | 584 } // namespace test |
| 584 } // namespace ws | 585 } // namespace ws |
| 585 } // namespace ui | 586 } // namespace ui |
| OLD | NEW |