Allow parallel creation of windows

services/ui/demo/mus_demo_external.cc

 // Copyright 2017 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.
 
 #include "services/ui/demo/mus_demo_external.h"
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/ui/demo/window_tree_data.h"
@@ skipping 48 matching lines @@
     }
   }
 
   window_tree_client()->ConnectViaWindowTreeHostFactory();
 
   // TODO(tonikitoo,fwang): Implement management of displays in external mode.
   // For now, a fake display is created in order to work around an assertion in
   // aura::GetDeviceScaleFactorFromDisplay().
   AddPrimaryDisplay(display::Display(0));
 
-  // TODO(tonikitoo,fwang): New windows can be launched without need to wait
-  // the respective ::OnEmbed call of the previous instance.
-  OpenNewWindow();
+  for (size_t i = 0; i < number_of_windows_; ++i)
+    OpenNewWindow(i);
 }
 
-void MusDemoExternal::OpenNewWindow() {
+void MusDemoExternal::OpenNewWindow(size_t window_index) {
   AppendWindowTreeData(base::MakeUnique<WindowTreeDataExternal>(
-      window_tree_client(),
-      GetSquareSizeForWindow(initialized_windows_count_)));
+      window_tree_client(), GetSquareSizeForWindow(window_index)));
 }
 
-void MusDemoExternal::OnEmbed(
-    std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
-  DCHECK(!window_tree_host);
-
-  // TODO: Clean up WindowTreeClientDelegate::OnEmbed API so that it passes
-  // no ownership of WindowTreeHostMus instance.
-  InitWindowTreeData(nullptr);
-  initialized_windows_count_++;
-
-  // Open the next window until the requested number of windows is reached.
-  if (initialized_windows_count_ < number_of_windows_)
-    OpenNewWindow();
+void MusDemoExternal::OnEmbedRootReady(
+    aura::WindowTreeHostMus* window_tree_host) {
+  DCHECK(window_tree_host);
+  auto window_tree_data = FindWindowTreeData(window_tree_host);
+  (*window_tree_data)->Init();
 }
 
 void MusDemoExternal::OnEmbedRootDestroyed(
     aura::WindowTreeHostMus* window_tree_host) {
   RemoveWindowTreeData(window_tree_host);
 }
 
 }  // namespace demo
 }  // namespace ui