Index: athena/content/content_activity_factory.cc |
diff --git a/athena/content/content_activity_factory.cc b/athena/content/content_activity_factory.cc |
index 4f74909164eeea342f25b7ff118e7e9a70bf29f0..3a086410f63f533a3bf5ca59661d09bd4b572766 100644 |
--- a/athena/content/content_activity_factory.cc |
+++ b/athena/content/content_activity_factory.cc |
@@ -4,6 +4,7 @@ |
#include "athena/content/public/content_activity_factory.h" |
+#include "athena/content/app_activity.h" |
#include "athena/content/web_activity.h" |
#include "base/logging.h" |
@@ -21,24 +22,8 @@ Activity* ContentActivityFactory::CreateWebActivity( |
} |
Activity* ContentActivityFactory::CreateAppActivity( |
- content::BrowserContext* browser_context, |
- const std::string& app_id) { |
- // TODO(mukai): port the extension system and launch the app actually. |
- GURL url; |
- if (app_id == "mail") |
- url = GURL("https://mail.google.com/"); |
- else if (app_id == "calendar") |
- url = GURL("https://calendar.google.com/"); |
- else if (app_id == "video") |
- url = GURL("http://youtube.com/"); |
- else if (app_id == "music") |
- url = GURL("https://play.google.com/music"); |
- else if (app_id == "contact") |
- url = GURL("https://www.google.com/contacts"); |
- else |
- LOG(FATAL) << "Unknown app id: " << app_id; |
- DCHECK(!url.is_empty()); |
- return CreateWebActivity(browser_context, url); |
+ apps::ShellAppWindow* app_window) { |
+ return new AppActivity(app_window); |
} |
} // namespace athena |