Use StrongBinding instead of InterfaceImpl in wm event dispatcher

services/window_manager/window_manager_app.cc

 // 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.
 
 #include "services/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
@@ skipping 35 matching lines @@
   mojo::ServiceProviderPtr exposed_services;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, public:
 
 WindowManagerApp::WindowManagerApp(
     ViewManagerDelegate* view_manager_delegate,
     WindowManagerDelegate* window_manager_delegate)
     : shell_(nullptr),
-      native_viewport_event_dispatcher_factory_(this),
       wrapped_view_manager_delegate_(view_manager_delegate),
       window_manager_delegate_(window_manager_delegate),
       root_(nullptr) {
 }
 
 WindowManagerApp::~WindowManagerApp() {
   // TODO(msw|sky): Should this destructor explicitly delete the ViewManager?
   mojo::ViewManager* cached_view_manager = view_manager();
   for (RegisteredViewIdSet::const_iterator it = registered_view_id_set_.begin();
        cached_view_manager && it != registered_view_id_set_.end(); ++it) {
@@ skipping 78 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, ApplicationDelegate implementation:
 
 void WindowManagerApp::Initialize(mojo::ApplicationImpl* impl) {
   shell_ = impl->shell();
   LaunchViewManager(impl);
 }
 
 bool WindowManagerApp::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
-  connection->AddService(static_cast<InterfaceFactory<WindowManager>*>(this));
+  connection->AddService<WindowManager>(this);
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, ViewManagerDelegate implementation:
 
 void WindowManagerApp::OnEmbed(
     View* root,
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exposed_services) {
@@ skipping 160 matching lines @@
 
 void WindowManagerApp::LaunchViewManager(mojo::ApplicationImpl* app) {
   // TODO(sky): figure out logic if this connection goes away.
   view_manager_client_factory_.reset(
       new mojo::ViewManagerClientFactory(shell_, this));
 
   ApplicationConnection* view_manager_app =
       app->ConnectToApplication("mojo:view_manager");
   view_manager_app->ConnectToService(&view_manager_service_);
 
-  view_manager_app->AddService(&native_viewport_event_dispatcher_factory_);
   view_manager_app->AddService<WindowManagerInternal>(this);
+  view_manager_app->AddService<mojo::NativeViewportEventDispatcher>(this);
 
   view_manager_app->ConnectToService(&window_manager_client_);
 }
 
 void WindowManagerApp::Create(
     ApplicationConnection* connection,
     mojo::InterfaceRequest<WindowManagerInternal> request) {
   if (wm_internal_binding_.get()) {
     VLOG(1) <<
         "WindowManager allows only one WindowManagerInternal connection.";
     return;
   }
   wm_internal_binding_.reset(
       new mojo::Binding<WindowManagerInternal>(this, request.Pass()));
 }
 
 void WindowManagerApp::Create(ApplicationConnection* connection,
                               mojo::InterfaceRequest<WindowManager> request) {
   WindowManagerImpl* wm = new WindowManagerImpl(this, false);
   wm->Bind(request.PassMessagePipe());
   // WindowManagerImpl is deleted when the connection has an error, or from our
   // destructor.
 }
 
+void WindowManagerApp::Create(
+    mojo::ApplicationConnection* connection,
+    mojo::InterfaceRequest<mojo::NativeViewportEventDispatcher> request) {
+  new NativeViewportEventDispatcherImpl(this, request.Pass());
+}
+
 void WindowManagerApp::CreateWindowManagerForViewManagerClient(
     uint16_t connection_id,
     mojo::ScopedMessagePipeHandle window_manager_pipe) {
   // TODO(sky): pass in |connection_id| for validation.
   WindowManagerImpl* wm = new WindowManagerImpl(this, true);
   wm->Bind(window_manager_pipe.Pass());
   // WindowManagerImpl is deleted when the connection has an error, or from our
   // destructor.
 }
 
 void WindowManagerApp::SetViewManagerClient(
     mojo::ScopedMessagePipeHandle view_manager_client_request) {
   view_manager_client_.reset(
       mojo::ViewManagerClientFactory::WeakBindViewManagerToPipe(
           mojo::MakeRequest<mojo::ViewManagerClient>(
               view_manager_client_request.Pass()),
           view_manager_service_.Pass(), shell_, this));
 }
 
 }  // namespace window_manager