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

Unified Diff: athena/content/content_activity_factory.cc

Issue 633623002: Handle transient children as a part of transient parent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | athena/wm/public/window_list_provider.h » ('j') | athena/wm/window_list_provider_impl.h » ('J')
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 01f8f5c6a62f835a2505db439a3be1c9775f25ab..b03dc50d12857951972fb86ba2815140bd7bd63a 100644
--- a/athena/content/content_activity_factory.cc
+++ b/athena/content/content_activity_factory.cc
@@ -8,6 +8,7 @@
#include "athena/content/app_activity.h"
#include "athena/content/web_activity.h"
#include "base/logging.h"
+#include "ui/aura/window.h"
namespace athena {
@@ -22,6 +23,7 @@ Activity* ContentActivityFactory::CreateWebActivity(
const GURL& url) {
Activity* activity = new WebActivity(browser_context, title, url);
ActivityManager::Get()->AddActivity(activity);
+ activity->GetWindow()->SetName("WebActivity");
Mr4D (OOO till 08-26) 2014/10/08 17:15:36 You might consider putting this into a separate CL
oshima 2014/10/08 19:05:30 sure
return activity;
}
@@ -30,6 +32,7 @@ Activity* ContentActivityFactory::CreateAppActivity(
views::WebView* web_view) {
Activity* activity = new AppActivity(app_id, web_view);
ActivityManager::Get()->AddActivity(activity);
+ activity->GetWindow()->SetName("AppActivity");
return activity;
}
« no previous file with comments | « no previous file | athena/wm/public/window_list_provider.h » ('j') | athena/wm/window_list_provider_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698