diff options
Diffstat (limited to 'athena/main')
| -rw-r--r-- | athena/main/athena_launcher.cc | 3 | ||||
| -rw-r--r-- | athena/main/athena_main.gyp | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc index de4dbc7..21faf6b 100644 --- a/athena/main/athena_launcher.cc +++ b/athena/main/athena_launcher.cc @@ -6,6 +6,7 @@ #include "athena/activity/public/activity_factory.h" #include "athena/activity/public/activity_manager.h" +#include "athena/content/public/app_registry.h" #include "athena/content/public/content_activity_factory.h" #include "athena/content/public/content_app_model_builder.h" #include "athena/home/public/home_card.h" @@ -119,6 +120,7 @@ void StartAthenaEnv(aura::Window* root_window, athena::InputManager::Create()->OnRootWindowCreated(root_window); athena::ScreenManager::Create(delegate, root_window); athena::WindowManager::Create(); + athena::AppRegistry::Create(); SetupBackgroundImage(); athena::ScreenManager::Get()->GetContext()->SetProperty( @@ -151,6 +153,7 @@ void ShutdownAthena() { athena::ActivityFactory::Shutdown(); athena::ActivityManager::Shutdown(); athena::HomeCard::Shutdown(); + athena::AppRegistry::ShutDown(); athena::WindowManager::Shutdown(); athena::ScreenManager::Shutdown(); athena::InputManager::Shutdown(); diff --git a/athena/main/athena_main.gyp b/athena/main/athena_main.gyp index c4641a8..b9a075f 100644 --- a/athena/main/athena_main.gyp +++ b/athena/main/athena_main.gyp @@ -13,6 +13,7 @@ 'dependencies': [ '../athena.gyp:athena_lib', '../athena.gyp:athena_content_lib', + '../athena.gyp:athena_content_support_lib', '../resources/athena_resources.gyp:athena_resources', # debug_widow.cc depends on this. Remove this once debug_window # is removed. |