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

Unified Diff: athena/content/content_activity_factory.cc

Issue 596493002: Add actiivity in factory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/activity/activity_manager_unittest.cc ('k') | athena/content/web_activity.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/content_activity_factory.cc
diff --git a/athena/content/content_activity_factory.cc b/athena/content/content_activity_factory.cc
index ef00f1c9996ed347442719d1a480a089e86c0b80..2d8867e601cf8ea16923c44a0a71da1743720315 100644
--- a/athena/content/content_activity_factory.cc
+++ b/athena/content/content_activity_factory.cc
@@ -4,6 +4,7 @@
#include "athena/content/content_activity_factory.h"
+#include "athena/activity/public/activity_manager.h"
#include "athena/content/app_activity.h"
#include "athena/content/web_activity.h"
#include "base/logging.h"
@@ -19,13 +20,17 @@ Activity* ContentActivityFactory::CreateWebActivity(
content::BrowserContext* browser_context,
const base::string16& title,
const GURL& url) {
- return new WebActivity(browser_context, title, url);
+ Activity* activity = new WebActivity(browser_context, title, url);
+ ActivityManager::Get()->AddActivity(activity);
+ return activity;
}
Activity* ContentActivityFactory::CreateAppActivity(
extensions::AppWindow* app_window,
views::WebView* web_view) {
- return new AppActivity(app_window, web_view);
+ Activity* activity = new AppActivity(app_window, web_view);
+ ActivityManager::Get()->AddActivity(activity);
+ return activity;
}
ActivityFactory* CreateContentActivityFactory() {
« no previous file with comments | « athena/activity/activity_manager_unittest.cc ('k') | athena/content/web_activity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698