Revert "Delete the ViewManager and WindowManager services."

shell/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/mojo.gni")
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//mojo/tools/embed/rules.gni")
 import("//testing/test.gni")
@@ skipping 63 matching lines @@
         "android/library_loader.cc",
         "android/main.cc",
         "android/main.h",
       ]
 
       deps = shell_common_deps + [
                ":jni_headers",
                "//gpu/config",
                "//mojo/android:libsystem_java",
                "//mojo/common",
+               "//mojo/services/window_manager/interfaces:interfaces",
                "//services/native_viewport:lib",
                "//shell/application_manager",
                "//ui/gl",
              ]
 
       data_deps = shell_common_data_deps
     }
   } else {
     executable("mojo_shell") {
       sources = [
@@ skipping 327 matching lines @@
       "//mojo/public/tools:copy_network_service",
     ]
 
     if (!is_debug) {
       sources += [
         "$root_out_dir/authenticating_url_loader_interceptor.mojo",
         "$root_out_dir/dart_content_handler.mojo",
         "$root_out_dir/device_info.mojo",
         "$root_out_dir/icu_data.mojo",
         "$root_out_dir/java_handler.mojo",
+        "$root_out_dir/kiosk_wm.mojo",
         "$root_out_dir/surfaces_service.mojo",
         "$root_out_dir/tracing.mojo",
+        "$root_out_dir/view_manager.mojo",
       ]
 
       deps += [
         "//services/authenticating_url_loader_interceptor",
         "//services/java_handler",
         "//services/dart:dart_content_handler",
         "//services/device_info",
         "//services/icu_data",
+        "//services/kiosk_wm",
         "//services/surfaces",
         "//services/tracing",
+        "//services/view_manager",
       ]
     }
   }
 
   copy_ex("copy_mojo_shell_test_assets") {
     clear_dir = true
     dest = mojo_shell_test_assets_dir
     sources = [
       "$root_out_dir/test_app.mojo",
       "$root_out_dir/test_request_tracker_app.mojo",
@@ skipping 259 matching lines @@
       "${root_out_dir}/libmojo_shell.so",
     ]
   } else {
     sources += [ "${root_out_dir}/mojo_shell" ]
   }
 
   outputs = [
     "${root_out_dir}/symbols/{{source_file_part}}",
   ]
 }