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

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

Issue 2623953002: [Chromecast] Fix media session blocking tests. (Closed)
Patch Set: [Chromecast] Fix media session blocking tests. Created 3 years, 10 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>
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 ~MediaSessionImpl() override; 78 ~MediaSessionImpl() override;
79 79
80 #if defined(OS_ANDROID) 80 #if defined(OS_ANDROID)
81 static MediaSession* FromJavaMediaSession( 81 static MediaSession* FromJavaMediaSession(
82 const base::android::JavaRef<jobject>& j_media_session); 82 const base::android::JavaRef<jobject>& j_media_session);
83 MediaSessionAndroid* session_android() const { 83 MediaSessionAndroid* session_android() const {
84 return session_android_.get(); 84 return session_android_.get();
85 } 85 }
86 #endif // defined(OS_ANDROID) 86 #endif // defined(OS_ANDROID)
87 87
88 void AddObserver(MediaSessionObserver* observer); 88 void AddObserver(MediaSessionObserver* observer) override;
jam 2017/02/01 23:07:59 nit: move by the other overridden methods
89 void RemoveObserver(MediaSessionObserver* observer); 89 void RemoveObserver(MediaSessionObserver* observer) override;
90 90
91 void NotifyMediaSessionMetadataChange( 91 void NotifyMediaSessionMetadataChange(
92 const base::Optional<MediaMetadata>& metadata); 92 const base::Optional<MediaMetadata>& metadata);
93 void NotifyMediaSessionActionsChange( 93 void NotifyMediaSessionActionsChange(
94 const std::set<blink::mojom::MediaSessionAction>& actions); 94 const std::set<blink::mojom::MediaSessionAction>& actions);
95 95
96 // Adds the given player to the current media session. Returns whether the 96 // Adds the given player to the current media session. Returns whether the
97 // player was successfully added. If it returns false, AddPlayer() should be 97 // player was successfully added. If it returns false, AddPlayer() should be
98 // called again later. 98 // called again later.
99 CONTENT_EXPORT bool AddPlayer(MediaSessionPlayerObserver* observer, 99 CONTENT_EXPORT bool AddPlayer(MediaSessionPlayerObserver* observer,
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 ServicesMap services_; 311 ServicesMap services_;
312 // The currently routed service (non-owned pointer). 312 // The currently routed service (non-owned pointer).
313 MediaSessionServiceImpl* routed_service_; 313 MediaSessionServiceImpl* routed_service_;
314 314
315 DISALLOW_COPY_AND_ASSIGN(MediaSessionImpl); 315 DISALLOW_COPY_AND_ASSIGN(MediaSessionImpl);
316 }; 316 };
317 317
318 } // namespace content 318 } // namespace content
319 319
320 #endif // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_ 320 #endif // CONTENT_BROWSER_MEDIA_SESSION_MEDIA_SESSION_IMPL_H_
OLDNEW
« no previous file with comments | « chromecast/browser/cast_media_blocker_unittest.cc ('k') | content/public/browser/media_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698