Fix mus_demo

components/mus/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 COMPONENTS_MUS_DEMO_MUS_DEMO_H_
 #define COMPONENTS_MUS_DEMO_MUS_DEMO_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/timer/timer.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_manager_delegate.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
-#include "components/mus/public/interfaces/window_tree_host.mojom.h"
+#include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace bitmap_uploader {
 class BitmapUploader;
 }
 
 namespace mus_demo {
 
 // A simple MUS Demo mojo app. This app connects to the mojo:mus, creates a new
 // 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 shell::ShellClient,
+                public mus::mojom::WindowManagerFactory,
                 public mus::WindowTreeDelegate,
                 public mus::WindowManagerDelegate {
  public:
   MusDemo();
   ~MusDemo() override;
 
  private:
   // shell::ShellClient:
   void Initialize(shell::Connector* connector,
                   const shell::Identity& identity,
                   uint32_t id) override;
   bool AcceptConnection(shell::Connection* connection) override;
 
   // WindowTreeDelegate:
   void OnEmbed(mus::Window* root) override;
   void OnUnembed(mus::Window* root) override;
   void OnConnectionLost(mus::WindowTreeConnection* connection) override;
   void OnEventObserved(const ui::Event& event, mus::Window* target) override;
 
+  // mus::mojom::WindowManagerFactory:
+  void CreateWindowManager(
+      mus::mojom::DisplayPtr display,
+      mus::mojom::WindowTreeClientRequest request) override;
+
   // WindowManagerDelegate:
   void SetWindowManagerClient(mus::WindowManagerClient* client) override;
   bool OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) override;
   bool OnWmSetProperty(
       mus::Window* window,
       const std::string& name,
       std::unique_ptr<std::vector<uint8_t>>* new_data) override;
   mus::Window* OnWmCreateTopLevelWindow(
       std::map<std::string, std::vector<uint8_t>>* properties) override;
   void OnAccelerator(uint32_t id, const ui::Event& event) override;
 
   // Allocate a bitmap the same size as the window to draw into.
   void AllocBitmap();
 
   // Draws one frame, incrementing the rotation angle.
   void DrawFrame();
 
   shell::Connector* connector_ = nullptr;
 
   mus::Window* window_ = nullptr;
-  mus::mojom::WindowTreeHostPtr window_tree_host_;
+  // mus::mojom::WindowTreeHostPtr window_tree_host_;

[kylechar, 2016/05/24 14:38:42]

Remove commented out code.

[rjkroege, 2016/05/24 18:05:15]

Done.

+  std::unique_ptr<mus::WindowTreeConnection> window_tree_connection_;
+  mus::WindowManagerClient* window_manager_client_ = nullptr;
+  mojo::Binding<mus::mojom::WindowManagerFactory>
+      window_manager_factory_binding_;
 
   // Used to send frames to mus.
   std::unique_ptr<bitmap_uploader::BitmapUploader> uploader_;
 
   // Bitmap that is the same size as our client window area.
   SkBitmap bitmap_;
 
   // Timer for calling DrawFrame().
   base::RepeatingTimer timer_;
 
   // Current rotation angle for drawing.
   double angle_ = 0.0;
 
   DISALLOW_COPY_AND_ASSIGN(MusDemo);
 };
 
 }  // namespace mus_demo
 
 #endif  // COMPONENTS_MUS_DEMO_MUS_DEMO_H_