Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2028)

Unified Diff: athena/main/athena_launcher.cc

Issue 487843003: ExtensionDelegate to abstract extension implementation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix deps Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/main/athena_launcher.h ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index b397fea20c20131c0e7abc9eb12a8297ae27ace0..700b869304a458e3c7368aa46409d4113d5fd65f 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -9,6 +9,7 @@
#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/extensions/public/extensions_delegate.h"
#include "athena/home/public/home_card.h"
#include "athena/home/public/home_card.h"
#include "athena/input/public/input_manager.h"
@@ -126,6 +127,7 @@ void StartAthenaEnv(aura::Window* root_window,
}
void StartAthenaSessionWithContext(content::BrowserContext* context) {
+ athena::ExtensionsDelegate::CreateExtensionsDelegateForShell(context);
StartAthenaSession(new athena::ContentActivityFactory(),
new athena::ContentAppModelBuilder(context));
athena::VirtualKeyboardManager::Create(context);
@@ -156,6 +158,7 @@ void ShutdownAthena() {
athena::ScreenManager::Shutdown();
athena::InputManager::Shutdown();
athena::SystemUI::Shutdown();
+ athena::ExtensionsDelegate::Shutdown();
delete views::ViewsDelegate::views_delegate;
}
« no previous file with comments | « athena/main/athena_launcher.h ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698