chrome/browser/ui/tabs/tab_utils.cc - Issue 569713002: Revert of Gardening: Revert "Use AudioStreamMonitor to control power save blocking."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 569713002: Revert of 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

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 e11df6cda92d47204a7b00c202e1b680240b3508..84956d19d9407363313a12bc4873cce71d3d2557 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,9 +117,7 @@

}

bool IsPlayingAudio(content::WebContents* contents) {

- AudioStreamMonitor* const audio_stream_monitor =

- AudioStreamMonitor::FromWebContents(contents);

- return audio_stream_monitor && audio_stream_monitor->WasRecentlyAudible();

+ return contents->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 »