Mus Demo: Refactor code to prepare multiple windows in external mode

services/ui/demo/mus_demo_external.h

Index: services/ui/demo/mus_demo_external.h
diff --git a/services/ui/demo/mus_demo_external.h b/services/ui/demo/mus_demo_external.h
index a3a8ca945c58add9e180a6f609fdac2f01814b22..109fe15b624e4b6ba480689267b07cb40ad4a538 100644
--- a/services/ui/demo/mus_demo_external.h
+++ b/services/ui/demo/mus_demo_external.h
@@ -22,15 +22,19 @@ class MusDemoExternal : public MusDemo {
   ~MusDemoExternal() final;
 
  private:
+  void OpenNewWindow();
+
   // ui::demo::MusDemo:
-  void OnStartImpl(std::unique_ptr<aura::WindowTreeClient>* window_tree_client,
-                   std::unique_ptr<WindowTreeData>* window_tree_data) final;
+  void OnStartImpl() final;
+  std::unique_ptr<aura::WindowTreeClient> CreateWindowTreeClient() final;
 
   // aura::WindowTreeClientDelegate:
   void OnEmbed(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) final;
   void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) final;
 
   mojom::WindowTreeHostFactoryPtr window_tree_host_factory_;
+  mojom::WindowTreeClientPtr tree_client_;

[kylechar, 2017/02/24 21:14:04]

Maybe change this name so it's obvious it's a mojo interface pointer vs the
other window_tree_client_ in MusDemo.

window_tree_client_mojo_?

[fwang, 2017/02/24 21:53:45]

Done.

+  size_t initialized_windows_count_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(MusDemoExternal);
 };