c++ / mojo changes for 'external window mode'

services/ui/demo/mus_demo.h

Index: services/ui/demo/mus_demo.h
diff --git a/services/ui/demo/mus_demo.h b/services/ui/demo/mus_demo.h
index 251a505818c42e56c559e517e5f1437bc7e9895c..51fd51e7a3e0d94e721eb74ae06fb277431139e9 100644
--- a/services/ui/demo/mus_demo.h
+++ b/services/ui/demo/mus_demo.h
@@ -62,10 +62,15 @@ class MusDemo : public service_manager::Service,
     return window_tree_client_.get();
   }
 
+  const std::vector<std::unique_ptr<WindowTreeData>>& window_tree_data_list()
+      const {
+    return window_tree_data_list_;
+  }
+

[fwang, 2017/03/07 09:21:24]

This is introduced only for overriding HasPendingWindowTreeData. But you don't
really need to. Just make IsInitialized() check window_delegate_ (or a new
initialized_ boolean) instead of the window_tree_host_.

[tonikitoo, 2017/03/07 14:00:49]

Done.

  private:
   virtual void OnStartImpl() = 0;
   virtual std::unique_ptr<aura::WindowTreeClient> CreateWindowTreeClient() = 0;
-  bool HasPendingWindowTreeData() const;
+  virtual bool HasPendingWindowTreeData() const;

[fwang, 2017/03/07 09:21:24]

Not needed (see above).

[tonikitoo, 2017/03/07 14:00:49]

Done.

 
   // service_manager::Service:
   void OnStart() override;