| Index: athena/main/athena_launcher.cc
|
| diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
|
| index 04b55a77f2981ad82955f8b15ebdfe329f1622e3..11dbab5c179b035f8cedb14b40ab2ee80883ba0c 100644
|
| --- a/athena/main/athena_launcher.cc
|
| +++ b/athena/main/athena_launcher.cc
|
| @@ -69,9 +69,9 @@ void StartAthena(aura::Window* root_window,
|
| aura::client::SetVisibilityClient(root_window,
|
| root_window_state->visibility_client.get());
|
|
|
| - athena::SystemUI::Create();
|
| athena::InputManager::Create()->OnRootWindowCreated(root_window);
|
| athena::ScreenManager::Create(root_window);
|
| + athena::SystemUI::Create();
|
| athena::WindowManager::Create();
|
| athena::HomeCard::Create(app_model_builder);
|
| athena::ActivityManager::Create();
|
| @@ -84,9 +84,9 @@ void ShutdownAthena() {
|
| athena::ActivityManager::Shutdown();
|
| athena::HomeCard::Shutdown();
|
| athena::WindowManager::Shutdown();
|
| + athena::SystemUI::Shutdown();
|
| athena::ScreenManager::Shutdown();
|
| athena::InputManager::Shutdown();
|
| - athena::SystemUI::Shutdown();
|
|
|
| delete views::ViewsDelegate::views_delegate;
|
| }
|
|
|