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

services/ui/demo/window_tree_data.h

Index: services/ui/demo/window_tree_data.h
diff --git a/services/ui/demo/window_tree_data.h b/services/ui/demo/window_tree_data.h
index 007b04f6d284c4d87c9775f239c2a8c65562e9c3..6214556bf6e4a66e6e3c01dfd0bfb892eebd78a3 100644
--- a/services/ui/demo/window_tree_data.h
+++ b/services/ui/demo/window_tree_data.h
@@ -26,13 +26,19 @@ class WindowTreeData {
   ~WindowTreeData();
 
   // Initializes the window tree host and start drawing frames.
-  void Init(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host);
+  virtual void Init(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host);

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

Not needed.

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

Done.

   bool IsInitialized() const { return !!window_tree_host_; }
 
   const aura::WindowTreeHostMus* WindowTreeHost() const {
     return window_tree_host_.get();
   }
 
+ protected:
+  void InitImpl(aura::WindowTreeHostMus* window_tree_host);

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

Not needed.

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

Done.

+
+  // The Window tree host corresponding to this data.
+  std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;

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

This should remain private IIUC chromium style.

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

Done.

+
  private:
   // Draws one frame, incrementing the rotation angle.
   void DrawFrame();
@@ -40,9 +46,6 @@ class WindowTreeData {
   // 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;