| Index: ui/aura/mus/window_tree_host_mus.cc
|
| diff --git a/ui/aura/mus/window_tree_host_mus.cc b/ui/aura/mus/window_tree_host_mus.cc
|
| index 8ff144e9a0d6e7101257db6e48b72f44b72e8185..85cdf6a4dbffecb270771c8ea66f2d378295362c 100644
|
| --- a/ui/aura/mus/window_tree_host_mus.cc
|
| +++ b/ui/aura/mus/window_tree_host_mus.cc
|
| @@ -52,9 +52,7 @@ WindowTreeHostMus::WindowTreeHostMus(WindowTreeHostMusInitParams init_params)
|
| // seems them at the time the window is created.
|
| for (auto& pair : init_params.properties)
|
| window_mus->SetPropertyFromServer(pair.first, &pair.second);
|
| - // TODO(fsamuel): Once the display compositor is decoupled from the browser
|
| - // process then ui::Compositor will not a cc::FrameSinkId.
|
| - CreateCompositor(init_params.frame_sink_id);
|
| + CreateCompositor(cc::FrameSinkId());
|
| gfx::AcceleratedWidget accelerated_widget;
|
| // We need accelerated widget numbers to be different for each
|
| // window and fit in the smallest sizeof(AcceleratedWidget) uint32_t
|
| @@ -86,9 +84,6 @@ WindowTreeHostMus::WindowTreeHostMus(WindowTreeHostMusInitParams init_params)
|
|
|
| // Mus windows are assumed hidden.
|
| compositor()->SetVisible(false);
|
| -
|
| - if (init_params.frame_sink_id.is_valid())
|
| - window_mus->SetFrameSinkIdFromServer(init_params.frame_sink_id);
|
| }
|
|
|
| WindowTreeHostMus::~WindowTreeHostMus() {
|
|
|