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

Unified Diff: ui/aura/mus/window_port_mus.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 | « ui/aura/mus/window_port_mus.h ('k') | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/window_port_mus.cc
diff --git a/ui/aura/mus/window_port_mus.cc b/ui/aura/mus/window_port_mus.cc
index abc2c23047975da0d8c507c4f298f878f0b78100..baba5ca7f1819823f2f9ec8f2b88db71b713d897 100644
--- a/ui/aura/mus/window_port_mus.cc
+++ b/ui/aura/mus/window_port_mus.cc
@@ -75,7 +75,6 @@ void WindowPortMus::Embed(
std::unique_ptr<WindowCompositorFrameSink>
WindowPortMus::RequestCompositorFrameSink(
- ui::mojom::CompositorFrameSinkType type,
scoped_refptr<cc::ContextProvider> context_provider,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
std::unique_ptr<WindowCompositorFrameSinkBinding>
@@ -84,16 +83,15 @@ WindowPortMus::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 WindowPortMus::AttachCompositorFrameSink(
- ui::mojom::CompositorFrameSinkType type,
std::unique_ptr<WindowCompositorFrameSinkBinding>
compositor_frame_sink_binding) {
window_tree_client_->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 | « ui/aura/mus/window_port_mus.h ('k') | ui/aura/mus/window_tree_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698