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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1970313002: Audio notification plumbed from guest WebContents up to embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 7 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
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_embedder.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 3362cc1b63417be749ef6832eabd73c03b175083..76cadf8e1ca262ca9b69753c5225f1a0b4366a5d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1290,6 +1290,9 @@ void WebContentsImpl::NotifyNavigationStateChanged(
if (delegate_)
delegate_->NavigationStateChanged(this, changed_flags);
+
+ if (GetOuterWebContents())
+ GetOuterWebContents()->NotifyNavigationStateChanged(changed_flags);
}
base::TimeTicks WebContentsImpl::GetLastActiveTime() const {
@@ -3045,7 +3048,9 @@ void WebContentsImpl::InsertCSS(const std::string& css) {
}
bool WebContentsImpl::WasRecentlyAudible() {
- return audio_stream_monitor_.WasRecentlyAudible();
+ return audio_stream_monitor_.WasRecentlyAudible() ||
+ (browser_plugin_embedder_ &&
+ browser_plugin_embedder_->WereAnyGuestsRecentlyAudible());
}
void WebContentsImpl::GetManifest(const GetManifestCallback& callback) {
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_embedder.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698