Revert "Delete the ViewManager and WindowManager services."

services/kiosk_wm/merged_service_provider.h

Index: services/kiosk_wm/merged_service_provider.h
diff --git a/services/kiosk_wm/merged_service_provider.h b/services/kiosk_wm/merged_service_provider.h
new file mode 100644
index 0000000000000000000000000000000000000000..4a84e43368fd014c4575828a5a06bd551ecd2078
--- /dev/null
+++ b/services/kiosk_wm/merged_service_provider.h
@@ -0,0 +1,41 @@
+// Copyright 2015 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_KIOSK_WM_MERGED_SERVICE_PROVIDER_H_
+#define SERVICES_KIOSK_WM_MERGED_SERVICE_PROVIDER_H_
+
+#include "base/memory/scoped_ptr.h"
+#include "mojo/public/cpp/application/interface_factory.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "mojo/public/interfaces/application/service_provider.mojom.h"
+#include "mojo/services/navigation/interfaces/navigation.mojom.h"
+
+namespace kiosk_wm {
+
+// Used to wrap the second incoming WindowManager Embed() "exposed_services"
+// parameter with a new ServiceProvider that adds the KioskWM's
+// NavigatorHost service.
+class MergedServiceProvider : public mojo::ServiceProvider {
+ public:
+  MergedServiceProvider(mojo::ServiceProviderPtr exposed_services,
+                        mojo::InterfaceFactory<mojo::NavigatorHost>* factory);
+  ~MergedServiceProvider() override;
+
+  mojo::ServiceProviderPtr GetServiceProviderPtr();
+
+ private:
+  // mojo::ServiceProvider:
+  void ConnectToService(const mojo::String& interface_name,
+                        mojo::ScopedMessagePipeHandle pipe) override;
+
+  mojo::ServiceProviderPtr exposed_services_;
+  mojo::InterfaceFactory<mojo::NavigatorHost>* factory_;
+  scoped_ptr<mojo::Binding<ServiceProvider>> binding_;
+
+  DISALLOW_COPY_AND_ASSIGN(MergedServiceProvider);
+};
+
+}  // namespace kiosk_wm
+
+#endif  // SERVICES_KIOSK_WM_MERGED_SERVICE_PROVIDER_H_