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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/main/athena_main.cc

Issue 311113005: AppModelBuilder to athena. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« athena/content/content_app_model_builder.cc ('K') | « athena/main/athena_launcher.cc ('k') | athena/test/DEPS » ('j') | athena/test/sample_activity_factory.cc » ('J')
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 90f0343515e026f1b3fe490ba9ac4055310ba200..7675670cb4685b7b8cf4e455790eb938f7bc7868 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -6,6 +6,7 @@
#include "apps/shell/browser/shell_browser_main_delegate.h"
#include "apps/shell/browser/shell_desktop_controller.h"
#include "athena/content/public/content_activity_factory.h"
+#include "athena/content/public/content_app_model_builder.h"
#include "athena/main/athena_launcher.h"
#include "athena/main/placeholder.h"
#include "athena/main/placeholder_content.h"
@@ -22,7 +23,8 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
virtual void Start(content::BrowserContext* context) OVERRIDE {
athena::StartAthena(
apps::ShellDesktopController::instance()->host()->window(),
- new athena::ContentActivityFactory());
+ new athena::ContentActivityFactory(),
+ new athena::ContentAppModelBuilder(context));
CreateTestWindows();
CreateTestPages(context);
}
« athena/content/content_app_model_builder.cc ('K') | « athena/main/athena_launcher.cc ('k') | athena/test/DEPS » ('j') | athena/test/sample_activity_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698