diff options
Diffstat (limited to 'components/view_manager/connection_manager.h')
| -rw-r--r-- | components/view_manager/connection_manager.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/components/view_manager/connection_manager.h b/components/view_manager/connection_manager.h index d683428..ee3cac1 100644 --- a/components/view_manager/connection_manager.h +++ b/components/view_manager/connection_manager.h @@ -15,6 +15,7 @@ #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" @@ -252,10 +253,6 @@ class ConnectionManager : public ServerViewDelegate, // 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_; @@ -271,6 +268,10 @@ class ConnectionManager : public ServerViewDelegate, AnimationRunner animation_runner_; + EventDispatcher event_dispatcher_; + + mojo::Binding<mojo::NativeViewportEventDispatcher> event_dispatcher_binding_; + scoped_ptr<FocusController> focus_controller_; mojo::ViewManagerRootClientPtr view_manager_root_client_; |