Revert of Mandoline: Remove native_viewport.mojom

components/view_manager/connection_manager.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 COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_
 #define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "components/view_manager/animation_runner.h"
 #include "components/view_manager/event_dispatcher.h"
 #include "components/view_manager/focus_controller_delegate.h"
 #include "components/view_manager/ids.h"
+#include "components/view_manager/public/interfaces/native_viewport.mojom.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "components/view_manager/public/interfaces/view_manager_root.mojom.h"
 #include "components/view_manager/server_view_delegate.h"
 #include "components/view_manager/server_view_observer.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 
 namespace view_manager {
 
 class ClientConnection;
@@ skipping 217 matching lines @@
   // provided to the initial connection (the WindowManager).
   // NOTE: |window_manager_client_connection_| is also in |connection_map_|.
   ClientConnection* window_manager_client_connection_;
 
   // ID to use for next ViewManagerServiceImpl.
   mojo::ConnectionSpecificId next_connection_id_;
 
   // Set of ViewManagerServiceImpls.
   ConnectionMap connection_map_;
 
-  // DisplayManager holds a raw pointer to EventDispatcher and so it must be
-  // destroyed after DisplayManager (and thus created before).
-  EventDispatcher event_dispatcher_;
-
   scoped_ptr<DisplayManager> display_manager_;
 
   scoped_ptr<ServerView> root_;
 
   // If non-null we're processing a change. The ScopedChange is not owned by us
   // (it's created on the stack by ViewManagerServiceImpl).
   ScopedChange* current_change_;
 
   bool in_destructor_;
 
   // TODO(sky): nuke! Just a proof of concept until get real animation api.
   base::RepeatingTimer<ConnectionManager> animation_timer_;
 
   AnimationRunner animation_runner_;
 
+  EventDispatcher event_dispatcher_;
+
+  mojo::Binding<mojo::NativeViewportEventDispatcher> event_dispatcher_binding_;
+
   scoped_ptr<FocusController> focus_controller_;
 
   mojo::ViewManagerRootClientPtr view_manager_root_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace view_manager
 
 #endif  // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_