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

Unified Diff: athena/main/athena_main.cc

Issue 336263002: Adds an item for loaded app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix 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
« no previous file with comments | « athena/content/content_app_model_builder.cc ('k') | no next file » | 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 4a69779866def67dd188ef55042f7742ccd72664..d76dc66aad89ba3582f628951dce46a338bd8937 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -29,12 +29,6 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
// apps::ShellBrowserMainDelegate:
virtual void Start(content::BrowserContext* context) OVERRIDE {
- athena::StartAthena(
- apps::ShellDesktopController::instance()->host()->window(),
- new athena::ContentActivityFactory(),
- new athena::ContentAppModelBuilder(context));
- athena::HomeCard::Get()->RegisterSearchProvider(
- new athena::UrlSearchProvider(context));
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(kAppSwitch)) {
base::FilePath app_dir(command_line->GetSwitchValueNative(kAppSwitch));
@@ -44,6 +38,13 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
extensions::ExtensionSystem::Get(context));
extension_system->LoadApp(app_absolute_dir);
}
+
+ athena::StartAthena(
+ apps::ShellDesktopController::instance()->host()->window(),
+ new athena::ContentActivityFactory(),
+ new athena::ContentAppModelBuilder(context));
+ athena::HomeCard::Get()->RegisterSearchProvider(
+ new athena::UrlSearchProvider(context));
CreateTestPages(context);
}
« no previous file with comments | « athena/content/content_app_model_builder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698