Mus Demo: Reorganize functions in mus_demo.cc

services/ui/demo/mus_demo.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/demo/mus_demo.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service_context.h"
@@ skipping 52 matching lines @@
   }
 
   canvas->drawRect(rect, paint);
 }
 
 }  // namespace
 
 class MusDemo::WindowTreeData {
  public:
   explicit WindowTreeData(
-      std::unique_ptr<aura::WindowTreeHostMus> window_tree_host);
+      std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
+    Init(std::move(window_tree_host));
+  }
   ~WindowTreeData();
 
  private:
+  // Initializes the window tree host and start drawing frames.
+  void Init(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host);
+
   // Draws one frame, incrementing the rotation angle.
   void DrawFrame();
 
   // The Window tree host corresponding to this data.
   std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;
 
   // Root window of the window tree host.
   aura::Window* root_window_ = nullptr;
 
   // Window to which we draw the bitmap.
   std::unique_ptr<aura::Window> bitmap_window_;
 
   // Destroys itself when the window gets destroyed.
   aura_extra::ImageWindowDelegate* window_delegate_ = nullptr;
 
   // Timer for calling DrawFrame().
   base::RepeatingTimer timer_;
 
   // Current rotation angle for drawing.
   double angle_ = 0.0;
 
   // Last time a frame was drawn.
   base::TimeTicks last_draw_frame_time_;
 };
 
+MusDemo::WindowTreeData::~WindowTreeData() {
+  timer_.Stop();
+  root_window_->RemoveChild(bitmap_window_.get());
+  bitmap_window_.reset();
+}
+
+void MusDemo::WindowTreeData::Init(
+    std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
+  window_tree_host->InitHost();
+  window_tree_host->Show();
+  root_window_ = window_tree_host->window();
+  // Take ownership of the WTH.
+  window_tree_host_ = std::move(window_tree_host);
+
+  // Initialize the window for the bitmap.
+  window_delegate_ = new aura_extra::ImageWindowDelegate();
+  bitmap_window_ = base::MakeUnique<aura::Window>(window_delegate_);
+  bitmap_window_->Init(LAYER_TEXTURED);
+  bitmap_window_->SetBounds(root_window_->bounds());
+  bitmap_window_->Show();
+  bitmap_window_->SetName("Bitmap");
+
+  root_window_->AddChild(bitmap_window_.get());
+
+  // Draw initial frame and start the timer to regularly draw frames.
+  DrawFrame();
+  timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kFrameDelay),
+               base::Bind(&WindowTreeData::DrawFrame, base::Unretained(this)));
+}
+
 MusDemo::MusDemo() {}
 
 MusDemo::~MusDemo() {
   display::Screen::SetScreenInstance(nullptr);
 }
 
 void MusDemo::OnStart() {
   screen_ = base::MakeUnique<display::ScreenBase>();
   display::Screen::SetScreenInstance(screen_.get());
 
@@ skipping 74 matching lines @@
 }
 
 void MusDemo::OnWmNewDisplay(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
     const display::Display& display) {
   DCHECK(!window_tree_data_);  // Only support one display.
   window_tree_data_ =
       base::MakeUnique<WindowTreeData>(std::move(window_tree_host));
 }
 
-MusDemo::WindowTreeData::WindowTreeData(
-    std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
-  window_tree_host->InitHost();
-  window_tree_host->Show();
-  root_window_ = window_tree_host->window();
-  // Take ownership of the WTH.
-  window_tree_host_ = std::move(window_tree_host);
-
-  // Initialize the window for the bitmap.
-  window_delegate_ = new aura_extra::ImageWindowDelegate();
-  bitmap_window_ = base::MakeUnique<aura::Window>(window_delegate_);
-  bitmap_window_->Init(LAYER_TEXTURED);
-  bitmap_window_->SetBounds(root_window_->bounds());
-  bitmap_window_->Show();
-  bitmap_window_->SetName("Bitmap");
-
-  root_window_->AddChild(bitmap_window_.get());
-
-  // Draw initial frame and start the timer to regularly draw frames.
-  DrawFrame();
-  timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kFrameDelay),
-               base::Bind(&WindowTreeData::DrawFrame, base::Unretained(this)));
-}
-
 void MusDemo::OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) {
   window_tree_data_.reset();
 }
 
-MusDemo::WindowTreeData::~WindowTreeData() {
-  timer_.Stop();
-  root_window_->RemoveChild(bitmap_window_.get());
-  bitmap_window_.reset();
-}
-
 void MusDemo::OnWmDisplayModified(const display::Display& display) {}
 
 mojom::EventResult MusDemo::OnAccelerator(uint32_t id, const Event& event) {
   return mojom::EventResult::UNHANDLED;
 }
 
 void MusDemo::OnWmPerformMoveLoop(aura::Window* window,
                                   mojom::MoveLoopSource source,
                                   const gfx::Point& cursor_location,
                                   const base::Callback<void(bool)>& on_done) {
@@ skipping 40 matching lines @@
   gfx::ImageSkiaRep image_skia_rep(bitmap, 1);
   gfx::ImageSkia image_skia(image_skia_rep);
   gfx::Image image(image_skia);
 
   window_delegate_->SetImage(image);
   bitmap_window_->SchedulePaintInRect(bitmap_window_->bounds());
 }
 
 }  // namespace demo
 }  // namespace aura