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

Unified Diff: chrome/browser/ui/tabs/tab_utils.cc

Issue 562863002: Gardening: Revert "Use AudioStreamMonitor to control power save blocking." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « chrome/browser/media/media_capture_devices_dispatcher.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/tabs/tab_utils.cc
diff --git a/chrome/browser/ui/tabs/tab_utils.cc b/chrome/browser/ui/tabs/tab_utils.cc
index 84956d19d9407363313a12bc4873cce71d3d2557..e11df6cda92d47204a7b00c202e1b680240b3508 100644
--- a/chrome/browser/ui/tabs/tab_utils.cc
+++ b/chrome/browser/ui/tabs/tab_utils.cc
@@ -5,10 +5,10 @@
#include "chrome/browser/ui/tabs/tab_utils.h"
#include "base/strings/string16.h"
+#include "chrome/browser/media/audio_stream_monitor.h"
#include "chrome/browser/media/media_capture_devices_dispatcher.h"
#include "chrome/browser/media/media_stream_capture_indicator.h"
#include "chrome/grit/generated_resources.h"
-#include "content/public/browser/web_contents.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -117,7 +117,9 @@ bool ShouldTabShowCloseButton(int capacity,
}
bool IsPlayingAudio(content::WebContents* contents) {
- return contents->WasRecentlyAudible();
+ AudioStreamMonitor* const audio_stream_monitor =
+ AudioStreamMonitor::FromWebContents(contents);
+ return audio_stream_monitor && audio_stream_monitor->WasRecentlyAudible();
}
TabMediaState GetTabMediaStateForContents(content::WebContents* contents) {
« no previous file with comments | « chrome/browser/media/media_capture_devices_dispatcher.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698