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..42d76e96ffa8a190b0b5824997eaf15d8e4418f2 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_;
+  unsigned initialized_windows_count_ = 0;
 

[kylechar, 2017/02/23 22:45:30]

I would use int or maybe size_t if you really want it to be unsigned.

"Do not use unsigned types to mean “this value should never be < 0”. For that,
use assertions or run-time checks (as appropriate)."

https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md

[fwang, 2017/02/24 10:08:51]

Acknowledged.

[fwang, 2017/02/24 10:40:11]

Done.

   DISALLOW_COPY_AND_ASSIGN(MusDemoExternal);
 };