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

Side by Side Diff: chrome/browser/media/android/router/media_router_android.h

Issue 1291203003: [Presentation API, Android] Implement routes observers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@close-route
Patch Set: Rebase Created 5 years, 4 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 CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 5 #ifndef CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
6 #define CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 6 #define CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 const std::string& message, 45 const std::string& message,
46 const SendRouteMessageCallback& callback) override; 46 const SendRouteMessageCallback& callback) override;
47 void SendRouteBinaryMessage( 47 void SendRouteBinaryMessage(
48 const MediaRoute::Id& route_id, 48 const MediaRoute::Id& route_id,
49 scoped_ptr<std::vector<uint8>> data, 49 scoped_ptr<std::vector<uint8>> data,
50 const SendRouteMessageCallback& callback) override; 50 const SendRouteMessageCallback& callback) override;
51 void ClearIssue(const Issue::Id& issue_id) override; 51 void ClearIssue(const Issue::Id& issue_id) override;
52 52
53 // JNI functions. 53 // JNI functions.
54 void OnSinksReceived( 54 void OnSinksReceived(
55 JNIEnv* env, jobject obj, jstring source_urn, jint count); 55 JNIEnv* env, jobject obj, jstring jsource_urn, jint jcount);
56 void OnRouteCreated( 56 void OnRouteCreated(
57 JNIEnv* env, 57 JNIEnv* env,
58 jobject obj, 58 jobject obj,
59 jstring media_route_id, 59 jstring jmedia_route_id,
60 jint jcreate_route_request_id, 60 jint jcreate_route_request_id,
61 jboolean jis_local); 61 jboolean jis_local);
62 void OnRouteCreationError( 62 void OnRouteCreationError(
63 JNIEnv* env, 63 JNIEnv* env,
64 jobject obj, 64 jobject obj,
65 jstring error_text, 65 jstring jerror_text,
66 jint jcreate_route_request_id); 66 jint jcreate_route_request_id);
67 void OnRouteClosed(JNIEnv* env, jobject obj, jstring jmedia_route_id);
67 68
68 private: 69 private:
69 friend class MediaRouterFactory; 70 friend class MediaRouterFactory;
70 71
71 explicit MediaRouterAndroid(content::BrowserContext*); 72 explicit MediaRouterAndroid(content::BrowserContext*);
72 73
73 // MediaRouter implementation. 74 // MediaRouter implementation.
74 void RegisterMediaSinksObserver(MediaSinksObserver* observer) override; 75 void RegisterMediaSinksObserver(MediaSinksObserver* observer) override;
75 void UnregisterMediaSinksObserver(MediaSinksObserver* observer) override; 76 void UnregisterMediaSinksObserver(MediaSinksObserver* observer) override;
76 void RegisterMediaRoutesObserver(MediaRoutesObserver* observer) override; 77 void RegisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
77 void UnregisterMediaRoutesObserver(MediaRoutesObserver* observer) override; 78 void UnregisterMediaRoutesObserver(MediaRoutesObserver* observer) override;
78 void RegisterIssuesObserver(IssuesObserver* observer) override; 79 void RegisterIssuesObserver(IssuesObserver* observer) override;
79 void UnregisterIssuesObserver(IssuesObserver* observer) override; 80 void UnregisterIssuesObserver(IssuesObserver* observer) override;
80 void RegisterPresentationSessionMessagesObserver( 81 void RegisterPresentationSessionMessagesObserver(
81 PresentationSessionMessagesObserver* observer) override; 82 PresentationSessionMessagesObserver* observer) override;
82 void UnregisterPresentationSessionMessagesObserver( 83 void UnregisterPresentationSessionMessagesObserver(
83 PresentationSessionMessagesObserver* observer) override; 84 PresentationSessionMessagesObserver* observer) override;
84 85
85 base::android::ScopedJavaGlobalRef<jobject> java_media_router_; 86 base::android::ScopedJavaGlobalRef<jobject> java_media_router_;
86 87
87 using MediaSinkObservers = base::ScopedPtrHashMap< 88 using MediaSinkObservers = base::ScopedPtrHashMap<
88 MediaSource::Id, 89 MediaSource::Id,
89 scoped_ptr<base::ObserverList<MediaSinksObserver>>>; 90 scoped_ptr<base::ObserverList<MediaSinksObserver>>>;
90 MediaSinkObservers sinks_observers_; 91 MediaSinkObservers sinks_observers_;
91 92
93 base::ObserverList<MediaRoutesObserver> routes_observers_;
94
92 struct CreateMediaRouteRequest { 95 struct CreateMediaRouteRequest {
93 CreateMediaRouteRequest( 96 CreateMediaRouteRequest(
94 const MediaSource& source, 97 const MediaSource& source,
95 const MediaSink& sink, 98 const MediaSink& sink,
96 const std::string& presentation_id, 99 const std::string& presentation_id,
97 const std::vector<MediaRouteResponseCallback>& callbacks); 100 const std::vector<MediaRouteResponseCallback>& callbacks);
98 ~CreateMediaRouteRequest(); 101 ~CreateMediaRouteRequest();
99 102
100 MediaSource media_source; 103 MediaSource media_source;
101 MediaSink media_sink; 104 MediaSink media_sink;
102 std::string presentation_id; 105 std::string presentation_id;
103 std::vector<MediaRouteResponseCallback> callbacks; 106 std::vector<MediaRouteResponseCallback> callbacks;
104 }; 107 };
105 108
106 using CreateMediaRouteRequests = 109 using CreateMediaRouteRequests =
107 IDMap<CreateMediaRouteRequest, IDMapOwnPointer>; 110 IDMap<CreateMediaRouteRequest, IDMapOwnPointer>;
108 CreateMediaRouteRequests create_route_requests_; 111 CreateMediaRouteRequests create_route_requests_;
109 112
113 using MediaRoutes = std::vector<MediaRoute>;
114 MediaRoutes active_routes_;
115
110 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid); 116 DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid);
111 }; 117 };
112 118
113 } // namespace media_router 119 } // namespace media_router
114 120
115 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_ 121 #endif // CHROME_BROWSER_MEDIA_ANDROID_ROUTER_MEDIA_ROUTER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698