Index: athena/content/app_activity.cc |
diff --git a/athena/content/app_activity.cc b/athena/content/app_activity.cc |
index 309454ab401e440fc05f0282479f4f89ae03c7e8..1657237fd7235f5383c5a18083fd7aed815f25df 100644 |
--- a/athena/content/app_activity.cc |
+++ b/athena/content/app_activity.cc |
@@ -10,6 +10,7 @@ |
#include "athena/content/public/app_registry.h" |
#include "content/public/browser/web_contents.h" |
#include "extensions/shell/browser/shell_app_window.h" |
+#include "ui/aura/window.h" |
#include "ui/views/controls/webview/webview.h" |
#include "ui/views/widget/widget.h" |
@@ -83,7 +84,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() { |