Mus Demo: Move definition of WindowTreeData into separate files.

services/ui/demo/mus_demo.h

 // 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.
 
 #ifndef SERVICES_UI_DEMO_MUS_DEMO_H_
 #define SERVICES_UI_DEMO_MUS_DEMO_H_
 
 #include <map>
 #include <memory>
 #include <set>
@@ skipping 10 matching lines @@
 
 namespace aura {
 class Env;
 class PropertyConverter;
 
 namespace client {
 class DefaultCaptureClient;
 }
 }  // namespace aura
 
+namespace aura_extra {
+class ImageWindowDelegate;
+}  // namespace aura_extra
+
 namespace wm {
 class WMState;
 }
 
 namespace ui {
 namespace demo {
 
 // A simple MUS Demo service. This service connects to the service:ui, adds a
 // new window to the root Window, and draws a spinning square in the center of
 // the window. Provides a simple way to demonstrate that the graphic stack works
 // as intended.
 class MusDemo : public service_manager::Service,
                 public aura::WindowTreeClientDelegate,
                 public aura::WindowManagerDelegate {
  public:
   MusDemo();
   ~MusDemo() override;
 
+ protected:
+  class WindowTreeData {

[kylechar, 2017/02/14 16:58:10]

This is a pretty big class. Is there any reason it can't go in it's own file?

[fwang, 2017/02/14 17:20:26]

I guess so. I was not sure either :-)

[fwang, 2017/02/15 13:45:06]

Done.

+   public:
+    explicit WindowTreeData(
+        std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
+        int square_size);
+    ~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();
+
+    // Helper function to retrieve the window to which we draw the bitmap.
+    aura::Window* bitmap_window();
+
+    // The Window tree host corresponding to this data.
+    std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;
+
+    // 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;
+
+    // Size in pixels of the square to draw.
+    const int square_size_;
+
+    DISALLOW_COPY_AND_ASSIGN(WindowTreeData);
+  };
+  std::unique_ptr<WindowTreeData> window_tree_data_;

[kylechar, 2017/02/14 16:58:10]

Move to private section.

[fwang, 2017/02/14 17:20:26]

Yes, this will be needed later (see https://codereview.chromium.org/2693923004/
and https://codereview.chromium.org/2622103004/) but I did this move in that
commit as it was more logical.

[kylechar, 2017/02/14 18:27:00]

It should be in the private section regardless. If a subclass needs to use it
then a protected accessor method can be added.

https://google.github.io/styleguide/cppguide.html#Access_Control

[fwang, 2017/02/15 13:45:06]

Done.

+
  private:
   // service_manager::Service:
   void OnStart() override;
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // aura::WindowTreeClientDelegate:
   void OnEmbed(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
   void OnUnembed(aura::Window* root) override;
@@ skipping 36 matching lines @@
   void OnWmDeactivateWindow(aura::Window* window) override;
 
   std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
   std::unique_ptr<aura::Env> env_;
   std::unique_ptr<display::ScreenBase> screen_;
 
   std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_;
   std::unique_ptr<::wm::WMState> wm_state_;
   std::unique_ptr<aura::PropertyConverter> property_converter_;
 
-  class WindowTreeData;
-  std::unique_ptr<WindowTreeData> window_tree_data_;
-
   DISALLOW_COPY_AND_ASSIGN(MusDemo);
 };
 
 }  // namespace demo
 }  // namespace aura
 
 #endif  // SERVICES_UI_DEMO_MUS_DEMO_H_