content/browser/media/media_web_contents_observer.h - Issue 2003803002: Remove dependency of power_save_blocker_android on various content bits

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: content/browser/media/media_web_contents_observer.h

Issue 2003803002: Remove dependency of power_save_blocker_android on various content bits (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@power-save-task-runners

Patch Set: only .reset() Created 4 years, 6 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/devtools/render_frame_devtools_agent_host.cc ('k') | content/browser/media/media_web_contents_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/media/media_web_contents_observer.h

diff --git a/content/browser/media/media_web_contents_observer.h b/content/browser/media/media_web_contents_observer.h

index 072ef4239fe3b3a3398ccfaaaa943af6da5e5096..281e3e32c78bd33a88984710d2b05a3ccccb3ab4 100644

--- a/content/browser/media/media_web_contents_observer.h

+++ b/content/browser/media/media_web_contents_observer.h

@@ -16,6 +16,10 @@

#include "content/common/content_export.h"

#include "content/public/browser/web_contents_observer.h"

+#if defined(OS_ANDROID)

+#include "ui/android/view_android.h"

+#endif // OS_ANDROID

namespace content {

class PowerSaveBlocker;

@@ -96,6 +100,9 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {

ActiveMediaPlayerMap active_video_players_;

std::unique_ptr<PowerSaveBlocker> audio_power_save_blocker_;

std::unique_ptr<PowerSaveBlocker> video_power_save_blocker_;

+#if defined(OS_ANDROID)

+ std::unique_ptr<base::WeakPtrFactory<ui::ViewAndroid>> view_weak_factory_;

+#endif

MediaSessionControllersManager session_controllers_manager_;