Index: athena/main/athena_launcher.cc |
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc |
index 693243584c7202825ba6ad2ffac516a8f27184fe..190e74691c7e6f279d6e364628201223e9c44801 100644 |
--- a/athena/main/athena_launcher.cc |
+++ b/athena/main/athena_launcher.cc |
@@ -8,6 +8,7 @@ |
#include "athena/activity/public/activity_manager.h" |
#include "athena/content/public/content_activity_factory.h" |
#include "athena/content/public/content_app_model_builder.h" |
+#include "athena/extensions/public/extension_delegate.h" |
#include "athena/home/public/home_card.h" |
#include "athena/home/public/home_card.h" |
#include "athena/input/public/input_manager.h" |
@@ -125,6 +126,7 @@ void StartAthenaEnv(aura::Window* root_window) { |
} |
void StartAthenaSessionWithContext(content::BrowserContext* context) { |
+ athena::ExtensionDelegate::InitExtensionDelegateForShell(context); |
StartAthenaSession(new athena::ContentActivityFactory(), |
new athena::ContentAppModelBuilder(context)); |
athena::VirtualKeyboardManager::Create(context); |
@@ -154,6 +156,7 @@ void ShutdownAthena() { |
athena::ScreenManager::Shutdown(); |
athena::InputManager::Shutdown(); |
athena::SystemUI::Shutdown(); |
+ athena::ExtensionDelegate::Shutdown(); |
delete views::ViewsDelegate::views_delegate; |
} |