Refactors event dispatching of NativeViewport into its own interface

mojo/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 "mojo/services/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/aura/aura_init.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
@@ skipping 76 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, public:
 
 WindowManagerApp::WindowManagerApp(
     ViewManagerDelegate* view_manager_delegate,
     WindowManagerDelegate* window_manager_delegate)
     : 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() {}
 
 // static
 View* WindowManagerApp::GetViewForWindow(aura::Window* window) {
   return window->GetProperty(kViewKey);
 }
 
 aura::Window* WindowManagerApp::GetWindowForViewId(Id view) {
@@ skipping 260 matching lines @@
   MessagePipe pipe;
   ApplicationConnection* view_manager_app =
       app->ConnectToApplication("mojo:view_manager");
   ServiceProvider* view_manager_service_provider =
       view_manager_app->GetServiceProvider();
   view_manager_service_provider->ConnectToService(ViewManagerService::Name_,
                                                   pipe.handle1.Pass());
   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