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

Unified Diff: athena/content/app_activity.cc

Issue 591693002: Creating PNG images from web content to be used by OverviewMode navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed comment 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/content/app_activity.h ('k') | athena/content/app_activity_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/content/app_activity.cc
diff --git a/athena/content/app_activity.cc b/athena/content/app_activity.cc
index 885edba95d9f55ac41bc6627e54b3282c0c905c4..876850851ed55338e18d068ee84af22c52ba674d 100644
--- a/athena/content/app_activity.cc
+++ b/athena/content/app_activity.cc
@@ -29,9 +29,11 @@ AppActivity::AppActivity(extensions::AppWindow* app_window,
Observe(app_window->web_contents());
}
-scoped_ptr<ContentProxy> AppActivity::GetContentProxy(aura::Window* window) {
+scoped_ptr<ContentProxy> AppActivity::GetContentProxy() {
+ // Note: After this call, the content is still valid because the contents
+ // destruction will destroy this |AppActivity| object.
if (content_proxy_.get())
- content_proxy_->Reparent(window);
+ content_proxy_->OnPreContentDestroyed();
return content_proxy_.Pass();
}
« no previous file with comments | « athena/content/app_activity.h ('k') | athena/content/app_activity_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698