InputManager/AcceleratorManager for athena

athena/main/athena_launcher.cc

Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index 6cdf031ea58a1a2e41b95b729fed4953c458b221..3600ae8fdf5e526674668796bb5d0e7cefdde43b 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -6,6 +6,7 @@
 
 #include "athena/activity/public/activity_manager.h"
 #include "athena/home/public/home_card.h"
+#include "athena/input/public/input_manager.h"
 #include "athena/main/placeholder.h"
 #include "athena/screen/public/screen_manager.h"
 #include "athena/wm/public/window_manager.h"
@@ -38,6 +39,7 @@ void StartAthena(aura::Window* root_window) {
   aura::client::SetVisibilityClient(root_window,
                                     root_window_state->visibility_client.get());
 
+  athena::InputManager::Create()->OnRootWindowCreated(root_window);
   athena::ScreenManager::Create(root_window);
   athena::WindowManager::Create();
   athena::HomeCard::Create();
@@ -47,10 +49,12 @@ void StartAthena(aura::Window* root_window) {
 }
 
 void ShutdownAthena() {
+  // athena::InputManager::Create()->OnRootWindowDestroying(root_window);

[Jun Mukai, 2014/06/04 04:02:34]

remove this

[oshima, 2014/06/04 04:24:27]

Oops, done. Thanks.

   athena::ActivityManager::Shutdown();
   athena::HomeCard::Shutdown();
   athena::WindowManager::Shutdown();
   athena::ScreenManager::Shutdown();
+  athena::InputManager::Shutdown();
 }
 
 }  // namespace athena