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

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

Issue 2610783003: mus: Make sure window parenting happens in the window server. (Closed)
Patch Set: . Created 3 years, 11 months 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
« no previous file with comments | « services/ui/ws/platform_display_default.cc ('k') | services/ui/ws/window_server.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 gfx::Rect GetBounds() const override { return display_metrics_.bounds; } 56 gfx::Rect GetBounds() const override { return display_metrics_.bounds; }
57 bool UpdateViewportMetrics(const display::ViewportMetrics& metrics) override { 57 bool UpdateViewportMetrics(const display::ViewportMetrics& metrics) override {
58 if (display_metrics_ == metrics) 58 if (display_metrics_ == metrics)
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 gfx::AcceleratedWidget GetAcceleratedWidget() const override {
67 return gfx::kNullAcceleratedWidget;
68 }
66 FrameGenerator* GetFrameGenerator() override { return nullptr; } 69 FrameGenerator* GetFrameGenerator() override { return nullptr; }
67 70
68 private: 71 private:
69 const int64_t id_; 72 const int64_t id_;
70 display::ViewportMetrics display_metrics_; 73 display::ViewportMetrics display_metrics_;
71 mojom::Cursor* cursor_storage_; 74 mojom::Cursor* cursor_storage_;
72 75
73 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay); 76 DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay);
74 }; 77 };
75 78
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 return nullptr; 625 return nullptr;
623 if (!tree->AddWindow(parent_client_id, client_window_id)) 626 if (!tree->AddWindow(parent_client_id, client_window_id))
624 return nullptr; 627 return nullptr;
625 *client_id = client_window_id; 628 *client_id = client_window_id;
626 return tree->GetWindowByClientId(client_window_id); 629 return tree->GetWindowByClientId(client_window_id);
627 } 630 }
628 631
629 } // namespace test 632 } // namespace test
630 } // namespace ws 633 } // namespace ws
631 } // namespace ui 634 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/ws/platform_display_default.cc ('k') | services/ui/ws/window_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698