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

Unified Diff: athena/main/athena_launcher.cc

Issue 505273002: Move app_shell specific impl from athena_lib to athena_shell_lib (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/content/shell/shell_app_activity.cc ('k') | athena/main/athena_main.cc » ('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 2f5c09b9e861b1f632c8ae0d2999f540f32fafde..521ec9fc4f610a438f142c2eb589c4be270b5be0 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -7,12 +7,11 @@
#include "athena/activity/public/activity_factory.h"
#include "athena/activity/public/activity_manager.h"
#include "athena/content/public/app_registry.h"
-#include "athena/content/public/content_activity_factory.h"
+#include "athena/content/public/content_activity_factory_creator.h"
#include "athena/content/public/content_app_model_builder.h"
#include "athena/env/public/athena_env.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"
#include "athena/main/debug/debug_window.h"
#include "athena/main/placeholder.h"
@@ -131,7 +130,7 @@ void StartAthenaEnv(scoped_refptr<base::TaskRunner> file_runner) {
}
void StartAthenaSessionWithContext(content::BrowserContext* context) {
- StartAthenaSession(new athena::ContentActivityFactory(),
+ StartAthenaSession(athena::CreateContentActivityFactory(),
new athena::ContentAppModelBuilder(context));
athena::VirtualKeyboardManager::Create(context);
athena::HomeCard::Get()->RegisterSearchProvider(
« no previous file with comments | « athena/content/shell/shell_app_activity.cc ('k') | athena/main/athena_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698