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

Unified Diff: services/ui/public/cpp/window.cc

Issue 2617403003: Mus: Remove CompositorFrameSinkType (Closed)
Patch Set: Fix some unit tests 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/ui/public/cpp/window.h ('k') | services/ui/public/cpp/window_tree_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/public/cpp/window.cc
diff --git a/services/ui/public/cpp/window.cc b/services/ui/public/cpp/window.cc
index bef5e653540f6007bfd5035bfbe5e011542176a3..907afcbac331ac5d39c072585b445ae0a539bfd0 100644
--- a/services/ui/public/cpp/window.cc
+++ b/services/ui/public/cpp/window.cc
@@ -270,7 +270,6 @@ bool Window::IsDrawn() const {
}
std::unique_ptr<WindowCompositorFrameSink> Window::RequestCompositorFrameSink(
- mojom::CompositorFrameSinkType type,
scoped_refptr<cc::ContextProvider> context_provider,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
std::unique_ptr<WindowCompositorFrameSinkBinding>
@@ -279,16 +278,15 @@ std::unique_ptr<WindowCompositorFrameSink> Window::RequestCompositorFrameSink(
WindowCompositorFrameSink::Create(std::move(context_provider),
gpu_memory_buffer_manager,
&compositor_frame_sink_binding);
- AttachCompositorFrameSink(type, std::move(compositor_frame_sink_binding));
+ AttachCompositorFrameSink(std::move(compositor_frame_sink_binding));
return compositor_frame_sink;
}
void Window::AttachCompositorFrameSink(
- mojom::CompositorFrameSinkType type,
std::unique_ptr<WindowCompositorFrameSinkBinding>
compositor_frame_sink_binding) {
window_tree()->AttachCompositorFrameSink(
- server_id_, type,
+ server_id_,
std::move(compositor_frame_sink_binding->compositor_frame_sink_request_),
mojo::MakeProxy(std::move(
compositor_frame_sink_binding->compositor_frame_sink_client_)));
« no previous file with comments | « services/ui/public/cpp/window.h ('k') | services/ui/public/cpp/window_tree_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698