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

Unified Diff: athena/content/app_activity.cc

Issue 513523002: Adding Baseframework of the ResourceManager (all hooks and observers) are being put in place with a… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Aaaand another rebase Created 6 years, 4 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
Index: athena/content/app_activity.cc
diff --git a/athena/content/app_activity.cc b/athena/content/app_activity.cc
index 48f9b6c0c1fe5011b81114dc67275daafca4a378..62ecb2cf859ab326e85c897d97ba4b4aab4bf78a 100644
--- a/athena/content/app_activity.cc
+++ b/athena/content/app_activity.cc
@@ -8,6 +8,7 @@
#include "athena/content/app_activity_registry.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() {

Powered by Google App Engine
This is Rietveld 408576698