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

Unified Diff: athena/main/athena_launcher.cc

Issue 513523002: Adding Baseframework of the ResourceManager (all hooks and observers) are being put in place with a… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Aaaand another rebase 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
Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index 521ec9fc4f610a438f142c2eb589c4be270b5be0..e3470bff67e13dc737f1e327b78d76882eb8694b 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -17,6 +17,7 @@
#include "athena/main/placeholder.h"
#include "athena/main/placeholder.h"
#include "athena/main/url_search_provider.h"
+#include "athena/resource_manager/public/resource_manager.h"
#include "athena/screen/public/screen_manager.h"
#include "athena/screen/public/screen_manager.h"
#include "athena/system/public/system_ui.h"
@@ -148,11 +149,13 @@ void StartAthenaSession(athena::ActivityFactory* activity_factory,
athena::AppModelBuilder* app_model_builder) {
athena::HomeCard::Create(app_model_builder);
athena::ActivityManager::Create();
+ athena::ResourceManager::Create();
athena::ActivityFactory::RegisterActivityFactory(activity_factory);
}
void ShutdownAthena() {
athena::ActivityFactory::Shutdown();
+ athena::ResourceManager::Shutdown();
athena::ActivityManager::Shutdown();
athena::HomeCard::Shutdown();
athena::AppRegistry::ShutDown();

Powered by Google App Engine
This is Rietveld 408576698