Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: services/ui/ws/test_utils.cc

Issue 2489003002: Convert mustash use surface references. (Closed)
Patch Set: Fixes for fsamuel. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 return false; 59 return false;
60 display_metrics_ = metrics; 60 display_metrics_ = metrics;
61 return true; 61 return true;
62 } 62 }
63 const display::ViewportMetrics& GetViewportMetrics() const override { 63 const display::ViewportMetrics& GetViewportMetrics() const override {
64 return display_metrics_; 64 return display_metrics_;
65 } 65 }
66 bool IsPrimaryDisplay() const override { return is_primary_; } 66 bool IsPrimaryDisplay() const override { return is_primary_; }
67 void OnGpuChannelEstablished( 67 void OnGpuChannelEstablished(
68 scoped_refptr<gpu::GpuChannelHost> host) override {} 68 scoped_refptr<gpu::GpuChannelHost> host) override {}
69 FrameGenerator* GetFrameGenerator() override { return nullptr; }
69 70
70 private: 71 private:
71 display::ViewportMetrics display_metrics_; 72 display::ViewportMetrics display_metrics_;
72 73
73 int64_t id_; 74 int64_t id_;
74 bool is_primary_; 75 bool is_primary_;
75 mojom::Cursor* cursor_storage_; 76 mojom::Cursor* cursor_storage_;
76 77
77 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay); 78 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay);
78 }; 79 };
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 return nullptr; 581 return nullptr;
581 if (!tree->AddWindow(parent_client_id, client_window_id)) 582 if (!tree->AddWindow(parent_client_id, client_window_id))
582 return nullptr; 583 return nullptr;
583 *client_id = client_window_id; 584 *client_id = client_window_id;
584 return tree->GetWindowByClientId(client_window_id); 585 return tree->GetWindowByClientId(client_window_id);
585 } 586 }
586 587
587 } // namespace test 588 } // namespace test
588 } // namespace ws 589 } // namespace ws
589 } // namespace ui 590 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698