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

Side by Side Diff: content/browser/media/session/media_session_impl.h

Issue 2623953002: [Chromecast] Fix media session blocking tests. (Closed)
Patch Set: Created 3 years, 11 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_SESSION_MEDIA_SESSION_IMPL_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_
6 #define CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_ 6 #define CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory>
11 #include <set> 12 #include <set>
12 13
13 #include "base/callback_list.h" 14 #include "base/callback_list.h"
14 #include "base/id_map.h" 15 #include "base/id_map.h"
15 #include "base/macros.h" 16 #include "base/macros.h"
16 #include "base/observer_list.h" 17 #include "base/observer_list.h"
17 #include "base/optional.h" 18 #include "base/optional.h"
18 #include "content/browser/media/session/audio_focus_manager.h" 19 #include "content/browser/media/session/audio_focus_manager.h"
19 #include "content/browser/media/session/media_session_uma_helper.h" 20 #include "content/browser/media/session/media_session_uma_helper.h"
20 #include "content/common/content_export.h" 21 #include "content/common/content_export.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 ~MediaSessionImpl() override; 79 ~MediaSessionImpl() override;
79 80
80 #if defined(OS_ANDROID) 81 #if defined(OS_ANDROID)
81 static MediaSession* FromJavaMediaSession( 82 static MediaSession* FromJavaMediaSession(
82 const base::android::JavaRef<jobject>& j_media_session); 83 const base::android::JavaRef<jobject>& j_media_session);
83 MediaSessionAndroid* session_android() const { 84 MediaSessionAndroid* session_android() const {
84 return session_android_.get(); 85 return session_android_.get();
85 } 86 }
86 #endif // defined(OS_ANDROID) 87 #endif // defined(OS_ANDROID)
87 88
88 void AddObserver(MediaSessionObserver* observer); 89 void AddObserver(MediaSessionObserver* observer) override;
89 void RemoveObserver(MediaSessionObserver* observer); 90 void RemoveObserver(MediaSessionObserver* observer) override;
90 91
91 void NotifyMediaSessionMetadataChange( 92 void NotifyMediaSessionMetadataChange(
92 const base::Optional<MediaMetadata>& metadata); 93 const base::Optional<MediaMetadata>& metadata);
93 void NotifyMediaSessionActionsChange( 94 void NotifyMediaSessionActionsChange(
94 const std::set<blink::mojom::MediaSessionAction>& actions); 95 const std::set<blink::mojom::MediaSessionAction>& actions);
95 96
96 // Adds the given player to the current media session. Returns whether the 97 // Adds the given player to the current media session. Returns whether the
97 // player was successfully added. If it returns false, AddPlayer() should be 98 // player was successfully added. If it returns false, AddPlayer() should be
98 // called again later. 99 // called again later.
99 CONTENT_EXPORT bool AddPlayer(MediaSessionPlayerObserver* observer, 100 CONTENT_EXPORT bool AddPlayer(MediaSessionPlayerObserver* observer,
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 ServicesMap services_; 312 ServicesMap services_;
312 // The currently routed service (non-owned pointer). 313 // The currently routed service (non-owned pointer).
313 MediaSessionServiceImpl* routed_service_; 314 MediaSessionServiceImpl* routed_service_;
314 315
315 DISALLOW_COPY_AND_ASSIGN(MediaSessionImpl); 316 DISALLOW_COPY_AND_ASSIGN(MediaSessionImpl);
316 }; 317 };
317 318
318 } // namespace content 319 } // namespace content
319 320
320 #endif // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_ 321 #endif // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698