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

services/ui/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 SERVICES_UI_DEMO_MUS_DEMO_H_
 #define SERVICES_UI_DEMO_MUS_DEMO_H_
 
 #include <memory>
 
 #include "base/callback.h"
@@ skipping 44 matching lines @@
   // a call to RemoveWindowTreeData.
   void AppendWindowTreeData(std::unique_ptr<WindowTreeData> window_tree_data);
   void InitWindowTreeData(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host);
   void RemoveWindowTreeData(aura::WindowTreeHostMus* window_tree_host);
 
   aura::WindowTreeClient* window_tree_client() {
     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;
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // aura::WindowTreeClientDelegate:
   void OnEmbed(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
   void OnUnembed(aura::Window* root) override;
@@ skipping 16 matching lines @@
   // next call to InitWindowTreeData.
   std::vector<std::unique_ptr<WindowTreeData>> window_tree_data_list_;
 
   DISALLOW_COPY_AND_ASSIGN(MusDemo);
 };
 
 }  // namespace demo
 }  // namespace ui
 
 #endif  // SERVICES_UI_DEMO_MUS_DEMO_H_