Refactors event dispatching of NativeViewport into its own interface

mojo/services/window_manager/window_manager_app.h

 // 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 MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 #define MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/aura/window_tree_host_mojo.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
 #include "mojo/services/public/cpp/view_manager/view_observer.h"
+#include "mojo/services/public/interfaces/window_manager/window_manager_internal.mojom.h"
+#include "mojo/services/window_manager/native_viewport_event_dispatcher_impl.h"
 #include "mojo/services/window_manager/window_manager_impl.h"
-#include "mojo/services/window_manager/window_manager_internal_service_impl.h"
 #include "mojo/services/window_manager/window_manager_service2_impl.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/events/event_handler.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace aura {
 namespace client {
 class ActivationClient;
 class FocusClient;
 }
@@ skipping 49 matching lines @@
   void ActivateWindow(Id view);
 
   bool IsReady() const;
 
   // A client of this object will use this accessor to gain access to the
   // aura::Window hierarchy and attach event handlers.
   WindowTreeHostMojo* host() { return window_tree_host_.get(); }
 
   void InitFocus(wm::FocusRules* rules);
 
-  void set_window_manager_client(WindowManagerInternalClient* client) {
-    window_manager_client_ = client;
-  }
-
   // WindowManagerImpl::Embed() forwards to this. If connected to ViewManager
   // then forwards to delegate, otherwise waits for connection to establish then
   // forwards.
   void Embed(const String& url,
              InterfaceRequest<ServiceProvider> service_provider);
 
   // Overridden from ApplicationDelegate:
   void Initialize(ApplicationImpl* impl) override;
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override;
 
@@ skipping 43 matching lines @@
   void LaunchViewManager(ApplicationImpl* app);
 
   Shell* shell_;
 
   InterfaceFactoryImplWithContext<WindowManagerService2Impl, WindowManagerApp>
       window_manager_service2_factory_;
 
   InterfaceFactoryImplWithContext<WindowManagerImpl, WindowManagerApp>
       window_manager_factory_;
 
-  InterfaceFactoryImplWithContext<WindowManagerInternalServiceImpl,
+  InterfaceFactoryImplWithContext<NativeViewportEventDispatcherImpl,
                                   WindowManagerApp>
-      window_manager_internal_service_factory_;
+      native_viewport_event_dispatcher_factory_;
 
   ViewManagerDelegate* wrapped_view_manager_delegate_;
   WindowManagerDelegate* window_manager_delegate_;
 
   ViewManager* view_manager_;
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
   View* root_;
 
   scoped_ptr<AuraInit> aura_init_;
   scoped_ptr<WindowTreeHostMojo> window_tree_host_;
 
   scoped_ptr<wm::ScopedCaptureClient> capture_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
   aura::client::ActivationClient* activation_client_;
 
   Connections connections_;
   ViewIdToWindowMap view_id_to_window_map_;
 
   scoped_ptr<DummyDelegate> dummy_delegate_;
 
-  WindowManagerInternalClient* window_manager_client_;
+  WindowManagerInternalClientPtr window_manager_client_;
 
   ScopedVector<PendingEmbed> pending_embeds_;
 
   scoped_ptr<ViewManagerClient> view_manager_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_