diff options
Diffstat (limited to 'athena/content/app_activity.cc')
| -rw-r--r-- | athena/content/app_activity.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/athena/content/app_activity.cc b/athena/content/app_activity.cc index 885edba..8768508 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(); } |