Index: content/browser/web_contents/web_contents_view_aura.cc |
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc |
index b58b77012b7d981e9913c658046344eeb16b024d..e9ef7f44d925fdfb66a2b22cb95856ec01a5f457 100644 |
--- a/content/browser/web_contents/web_contents_view_aura.cc |
+++ b/content/browser/web_contents/web_contents_view_aura.cc |
@@ -1601,6 +1601,10 @@ void WebContentsViewAura::OnWindowVisibilityChanged(aura::Window* window, |
} |
void WebContentsViewAura::UpdateWebContentsVisibility(bool visible) { |
+#if defined(USE_ATHENA) |
+ // In Athena the resources/visibility get controlled by Activities and the |
+ // ResourceManager and not the window visibility. |
oshima
2014/09/03 23:15:00
have you consult this approach (if def) with conte
Mr4D (OOO till 08-26)
2014/09/04 19:10:57
We don't do this. I have to come up with a differe
|
+#else |
if (!is_or_was_visible_) { |
// We should not hide the web contents before it was shown the first time, |
// since resources would immediately be destroyed and only re-created after |
@@ -1621,6 +1625,7 @@ void WebContentsViewAura::UpdateWebContentsVisibility(bool visible) { |
if (web_contents_->should_normally_be_visible()) |
web_contents_->WasHidden(); |
} |
+#endif |
} |
} // namespace content |