| Index: ui/aura/window_tree_host.cc | 
| diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc | 
| index 87fac84f1cfdfdd5241b829cdd23697b119055f6..05747c40606622fec80dae34098559b5bce54bca 100644 | 
| --- a/ui/aura/window_tree_host.cc | 
| +++ b/ui/aura/window_tree_host.cc | 
| @@ -66,14 +66,6 @@ void WindowTreeHost::InitHost() { | 
| window()->Show(); | 
| } | 
|  | 
| -void WindowTreeHost::InitCompositor() { | 
| -  compositor_->SetScaleAndSize(GetDeviceScaleFactorFromDisplay(window()), | 
| -                               GetBoundsInPixels().size()); | 
| -  compositor_->SetRootLayer(window()->layer()); | 
| -  compositor_->SetDisplayColorSpace( | 
| -      GetICCProfileForCurrentDisplay().GetColorSpace()); | 
| -} | 
| - | 
| void WindowTreeHost::AddObserver(WindowTreeHostObserver* observer) { | 
| observers_.AddObserver(observer); | 
| } | 
| @@ -266,6 +258,14 @@ void WindowTreeHost::CreateCompositor() { | 
| } | 
| } | 
|  | 
| +void WindowTreeHost::InitCompositor() { | 
| +  compositor_->SetScaleAndSize(GetDeviceScaleFactorFromDisplay(window()), | 
| +                               GetBoundsInPixels().size()); | 
| +  compositor_->SetRootLayer(window()->layer()); | 
| +  compositor_->SetDisplayColorSpace( | 
| +      GetICCProfileForCurrentDisplay().GetColorSpace()); | 
| +} | 
| + | 
| void WindowTreeHost::OnAcceleratedWidgetAvailable() { | 
| compositor_->SetAcceleratedWidget(GetAcceleratedWidget()); | 
| prop_.reset(new ui::ViewProp(GetAcceleratedWidget(), | 
|  |