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(); |
} |