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

Unified Diff: athena/main/athena_main.cc

Issue 302683002: athena: Add the concept of Activity and related managers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 7 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_main.cc
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc
index 8c6e7aba36b2683b498e6639b33d4acc81cf5c66..3c63ba8032c4b6243e9038d96de4b3924a58ac4f 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -8,6 +8,7 @@
#include "athena/home/public/home_card.h"
#include "athena/main/placeholder.h"
#include "athena/screen/public/screen_manager.h"
+#include "athena/task/public/task_manager.h"
#include "athena/wm/public/window_manager.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/app/content_main.h"
@@ -30,12 +31,15 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
athena::ScreenManager::Create(root_window);
athena::WindowManager::Create();
athena::HomeCard::Create();
+ athena::TaskManager::Create();
SetupBackgroundImage();
CreateTestWindows();
+ CreateTestPages(context);
}
virtual void Shutdown() OVERRIDE {
+ athena::TaskManager::Shutdown();
athena::HomeCard::Shutdown();
athena::WindowManager::Shutdown();
athena::ScreenManager::Shutdown();
« no previous file with comments | « athena/main/DEPS ('k') | athena/main/athena_main.gyp » ('j') | athena/task/public/task.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698