| Index: athena/content/app_activity.cc
|
| diff --git a/athena/content/app_activity.cc b/athena/content/app_activity.cc
|
| index 7dcad7eea683553f26e8e4d6fbd5d24e42fc5e6e..6eb469fb081c3fb83cf47688fee9ac5dfe688d1d 100644
|
| --- a/athena/content/app_activity.cc
|
| +++ b/athena/content/app_activity.cc
|
| @@ -9,6 +9,7 @@
|
| #include "athena/content/public/app_content_control_delegate.h"
|
| #include "athena/content/public/app_registry.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "ui/aura/window.h"
|
| #include "ui/views/controls/webview/webview.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| @@ -81,7 +82,11 @@ Activity::ActivityState AppActivity::GetCurrentState() {
|
| }
|
|
|
| bool AppActivity::IsVisible() {
|
| - return web_view_ && web_view_->IsDrawn();
|
| + return web_view_ &&
|
| + web_view_->IsDrawn() &&
|
| + current_state_ != ACTIVITY_UNLOADED &&
|
| + GetWindow() &&
|
| + GetWindow()->IsVisible();
|
| }
|
|
|
| Activity::ActivityMediaState AppActivity::GetMediaState() {
|
|
|