Revert "Delete the ViewManager and WindowManager services."

services/kiosk_wm/kiosk_wm_controller.h

Index: services/kiosk_wm/kiosk_wm_controller.h
diff --git a/services/kiosk_wm/kiosk_wm_controller.h b/services/kiosk_wm/kiosk_wm_controller.h
new file mode 100644
index 0000000000000000000000000000000000000000..25b7477d2a3980579c8287716e813a279c37d764
--- /dev/null
+++ b/services/kiosk_wm/kiosk_wm_controller.h
@@ -0,0 +1,84 @@
+// 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.
+
+#ifndef SERVICES_KIOSK_WM_KIOSK_WM_CONTROLLER_H_
+#define SERVICES_KIOSK_WM_KIOSK_WM_CONTROLLER_H_
+
+#include "base/memory/weak_ptr.h"
+#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/connect.h"
+#include "mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/services/input_events/interfaces/input_events.mojom.h"
+#include "mojo/services/navigation/interfaces/navigation.mojom.h"
+#include "mojo/services/view_manager/cpp/view_manager.h"
+#include "mojo/services/view_manager/cpp/view_manager_delegate.h"
+#include "mojo/services/view_manager/cpp/view_observer.h"
+#include "services/kiosk_wm/navigator_host_impl.h"
+#include "services/window_manager/window_manager_app.h"
+#include "services/window_manager/window_manager_delegate.h"
+#include "ui/base/accelerators/accelerator.h"
+
+namespace kiosk_wm {
+
+class MergedServiceProvider;
+
+class KioskWMController : public mojo::ViewObserver,
+                          public window_manager::WindowManagerController,
+                          public mojo::InterfaceFactory<mojo::NavigatorHost>,
+                          public ui::AcceleratorTarget {
+ public:
+  KioskWMController(window_manager::WindowManagerRoot* wm_root);
+  ~KioskWMController() override;
+
+  base::WeakPtr<KioskWMController> GetWeakPtr();
+
+  void ReplaceContentWithURL(const mojo::String& url);
+
+ private:
+  // Overridden from mojo::ViewManagerDelegate:
+  void OnEmbed(mojo::View* root,
+               mojo::InterfaceRequest<mojo::ServiceProvider> services,
+               mojo::ServiceProviderPtr exposed_services) override;
+  void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override;
+
+  // Overriden from mojo::ViewObserver:
+  void OnViewDestroyed(mojo::View* view) override;
+  void OnViewBoundsChanged(mojo::View* view,
+                           const mojo::Rect& old_bounds,
+                           const mojo::Rect& new_bounds) override;
+
+  // Overridden from WindowManagerDelegate:
+  void Embed(const mojo::String& url,
+             mojo::InterfaceRequest<mojo::ServiceProvider> services,
+             mojo::ServiceProviderPtr exposed_services) override;
+
+  // Overridden from mojo::InterfaceFactory<mojo::NavigatorHost>:
+  void Create(mojo::ApplicationConnection* connection,
+              mojo::InterfaceRequest<mojo::NavigatorHost> request) override;
+
+  // Overriden from ui::AcceleratorTarget:
+  bool AcceleratorPressed(const ui::Accelerator& accelerator,
+                          mojo::View* target) override;
+  bool CanHandleAccelerators() const override;
+
+  window_manager::WindowManagerRoot* window_manager_root_;
+
+  // Only support being embedded once, so both application-level
+  // and embedding-level state are shared on the same object.
+  mojo::View* root_;
+  mojo::View* content_;
+
+  mojo::ServiceProviderImpl exposed_services_impl_;
+  scoped_ptr<MergedServiceProvider> merged_service_provider_;
+
+  NavigatorHostImpl navigator_host_;
+
+  base::WeakPtrFactory<KioskWMController> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(KioskWMController);
+};
+
+}  // namespace kiosk_wm
+
+#endif  // SERVICES_KIOSK_WM_KIOSK_WM_H_