content/browser/media/media_web_contents_observer.h - Issue 2399023002: Make MediaSession available on Desktop

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/browser/media/media_web_contents_observer.h

Issue 2399023002: Make MediaSession available on Desktop (Closed)

Patch Set: merge BrowserMediaSessionManager into MediaSessionServiceImpl, temporarily removing BrowserTests Created 4 years, 2 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 unified diff | Download patch

« no previous file with comments | « content/browser/media/android/media_web_contents_observer_android.cc ('k') | content/browser/media/session/media_metadata_sanitizer.h » ('j') | content/browser/media/session/media_session_service_impl.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_	5 #ifndef CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_

6 #define CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_	6 #define CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_

7	7

8 #include <stdint.h>	8 #include <stdint.h>

9	9

10 #include <map>	10 #include <map>

11 #include <memory>	11 #include <memory>

12 #include <set>	12 #include <set>

13	13

	14 #include "base/containers/scoped_ptr_hash_map.h"

14 #include "base/macros.h"	15 #include "base/macros.h"

15 #include "content/browser/media/session/media_session_controllers_manager.h"	16 #include "content/browser/media/session/media_session_controllers_manager.h"

16 #include "content/common/content_export.h"	17 #include "content/common/content_export.h"

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

18	19

19 #if defined(OS_ANDROID)	20 #if defined(OS_ANDROID)

20 #include "ui/android/view_android.h"	21 #include "ui/android/view_android.h"

21 #endif // OS_ANDROID	22 #endif // OS_ANDROID

22	23

23 namespace device {	24 namespace device {

(...skipping 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
108 std::unique_ptr<device::PowerSaveBlocker> video_power_save_blocker_;	109 std::unique_ptr<device::PowerSaveBlocker> video_power_save_blocker_;

109	110

110 MediaSessionControllersManager session_controllers_manager_;	111 MediaSessionControllersManager session_controllers_manager_;

111	112

112 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver);	113 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver);

113 };	114 };

114	115

115 } // namespace content	116 } // namespace content

116	117

117 #endif // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_	118 #endif // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_

OLD	NEW