Refactors event dispatching of NativeViewport into its own interface

mojo/services/window_manager/window_manager_app.cc

Index: mojo/services/window_manager/window_manager_app.cc
diff --git a/mojo/services/window_manager/window_manager_app.cc b/mojo/services/window_manager/window_manager_app.cc
index e9e77476571b6297ae86f2287025da728ae78d2c..9af766e194e5af9113563f086c65f74b4569fdc7 100644
--- a/mojo/services/window_manager/window_manager_app.cc
+++ b/mojo/services/window_manager/window_manager_app.cc
@@ -94,13 +94,12 @@ WindowManagerApp::WindowManagerApp(
     : shell_(nullptr),
       window_manager_service2_factory_(this),
       window_manager_factory_(this),
-      window_manager_internal_service_factory_(this),
+      native_viewport_event_dispatcher_factory_(this),
       wrapped_view_manager_delegate_(view_manager_delegate),
       window_manager_delegate_(window_manager_delegate),
       view_manager_(NULL),
       root_(NULL),
-      dummy_delegate_(new DummyDelegate),
-      window_manager_client_(nullptr) {
+      dummy_delegate_(new DummyDelegate) {
 }
 
 WindowManagerApp::~WindowManagerApp() {}
@@ -381,7 +380,9 @@ void WindowManagerApp::LaunchViewManager(ApplicationImpl* app) {
   view_manager_client_ = ViewManagerClientFactory::WeakBindViewManagerToPipe(
                              pipe.handle0.Pass(), shell_, this).Pass();
 
-  view_manager_app->AddService(&window_manager_internal_service_factory_);
+  view_manager_app->AddService(&native_viewport_event_dispatcher_factory_);
+
+  view_manager_app->ConnectToService(&window_manager_client_);
 }
 
 }  // namespace mojo