Making WTH::InitCompositor() protected instead of public.

BUG=NONE

Committed: https://crrev.com/98f0f335c82dbbd932d3d5bad9fbb22585dafb65
Review-Url: https://codereview.chromium.org/2556803002
Cr-Original-Commit-Position: refs/heads/master@{#437292}
Cr-Commit-Position: refs/heads/master@{#437818}

ash/mus/window_manager.cc

@@ -217,7 +217,6 @@ display::mojom::DisplayController* WindowManager::GetDisplayController() {
 RootWindowController* WindowManager::CreateRootWindowController(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
     const display::Display& display) {
-  window_tree_host->InitCompositor();
   // TODO(sky): this is temporary, should use RootWindowController directly.
   aura::client::SetCaptureClient(window_tree_host->window(),
                                  wm_state_->capture_controller());

mash/simple_wm/simple_wm.cc

@@ -196,7 +196,6 @@ void SimpleWM::OnWmNewDisplay(
   // Only handles a single root.
   DCHECK(!root_);
   window_tree_host_ = std::move(window_tree_host);
-  window_tree_host_->InitCompositor();
   root_ = window_tree_host_->window();
   DCHECK(window_manager_client_);
   window_manager_client_->AddActivationParent(root_);

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);
 }
@@ -269,6 +261,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(),

ui/aura/window_tree_host.h

@@ -60,8 +60,6 @@ class AURA_EXPORT WindowTreeHost : public ui::internal::InputMethodDelegate,
 
   void InitHost();
 
-  void InitCompositor();
-
   void AddObserver(WindowTreeHostObserver* observer);
   void RemoveObserver(WindowTreeHostObserver* observer);
 
@@ -193,6 +191,7 @@ class AURA_EXPORT WindowTreeHost : public ui::internal::InputMethodDelegate,
   void DestroyDispatcher();
 
   void CreateCompositor();
+  void InitCompositor();
   void OnAcceleratedWidgetAvailable();
 
   // Returns the location of the RootWindow on native screen.