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

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
« no previous file with comments | « athena/main/athena_launcher.cc ('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_main.cc
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc
index 6ee8ee4a8c748ebbd75089187239ee6da3f413a1..692f80d1f10b3e96a2e6898e95a5947a795d83cb 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -7,6 +7,7 @@
#include "apps/shell/browser/shell_desktop_controller.h"
#include "athena/main/athena_launcher.h"
#include "athena/main/placeholder.h"
+#include "athena/main/placeholder_content.h"
#include "content/public/app/content_main.h"
#include "ui/aura/window_tree_host.h"
#include "ui/wm/core/visibility_controller.h"
@@ -22,6 +23,7 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
->GetWindowTreeHost()
->window());
CreateTestWindows();
+ CreateTestPages(context);
}
virtual void Shutdown() OVERRIDE { athena::ShutdownAthena(); }
« no previous file with comments | « athena/main/athena_launcher.cc ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698