Replace most uses of ViewManagerInitService with client lib ViewManager::Embed() to offer the same …

mojo/examples/wm_flow/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
 assert(use_aura)
 
 group("wm_flow" ) {
   deps = [
     ":app",
     ":embedded",
     ":init",
-    ":wm_flow_wm",
+    ":wm",
   ]
 }
 
 # GYP version: mojo/mojo_examples.gypi:mojo_wm_flow_wm

[sky, 2014/09/22 22:20:00]

Don't you need to update mojo/mojo_examples.gypi too?

[Ben Goodger (Google), 2014/09/22 22:26:07]

Nope, the gyp file was already correct. I don't think anyone else runs these
apps but me, so no one had bothered to make sure they worked properly in gn.

-shared_library("wm_flow_wm") {
+shared_library("wm") {
   output_name = "mojo_wm_flow_wm"
 
   sources = [
     "wm/wm.cc",
+    "wm/frame_controller.cc",
+    "wm/frame_controller.h",
   ]
 
   deps = [
     "//base",
     "//mojo/application",
     "//mojo/public/c/system:for_shared_library",
     "//mojo/services/public/cpp/view_manager",
     "//mojo/services/window_manager:lib",
+    "//mojo/views",
   ]
 }
 
 # GYP version: mojo/mojo_examples.gypi:mojo_wm_flow_init
 shared_library("init") {
   output_name = "mojo_wm_flow_init"
 
   sources = [
     "init/init.cc",
   ]
 
   deps = [
     "//base",
     "//mojo/application",
     "//mojo/public/c/system:for_shared_library",
+    "//mojo/services/public/cpp/view_manager",
     "//mojo/services/public/interfaces/view_manager",
   ]
 }
 
 # GYP version: mojo/mojo_examples.gypi:mojo_wm_flow_app
 shared_library("app") {
   output_name = "mojo_wm_flow_app"
 
   sources = [
     "app/app.cc",
@@ skipping 35 matching lines @@
     "app/embedder.mojom",
   ]
 }
 
 # GYP version: mojo/mojo_examples.gypi:mojo_wm_flow_embeddee_bindings
 mojom("embeddee_bindings") {
   sources = [
     "embedded/embeddee.mojom",
   ]
 }