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

Unified Diff: chrome/browser/media/android/router/media_router_android.h

Issue 1301773002: [Presentation API, Android] Implement starting a presentation via CreateRoute() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media-router-create
Patch Set: Added a bug for GoogleApiClient connection, unregister connection callbacks. 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/android/router/media_router_android.h
diff --git a/chrome/browser/media/android/router/media_router_android.h b/chrome/browser/media/android/router/media_router_android.h
index 74e0bf8092a8e3deba362936464037b68aaf4684..42b182d6dd549f2df91a766fad2735008f9943db 100644
--- a/chrome/browser/media/android/router/media_router_android.h
+++ b/chrome/browser/media/android/router/media_router_android.h
@@ -53,6 +53,17 @@ class MediaRouterAndroid : public MediaRouter {
// JNI functions.
void OnSinksReceived(
JNIEnv* env, jobject obj, jstring source_urn, jint count);
+ void OnRouteCreated(
+ JNIEnv* env,
+ jobject obj,
+ jstring media_route_id,
+ jint jcreate_route_request_id,
+ jboolean jis_local);
+ void OnRouteCreationError(
+ JNIEnv* env,
+ jobject obj,
+ jstring error_text,
+ jint jcreate_route_request_id);
private:
friend class MediaRouterFactory;
@@ -78,6 +89,24 @@ class MediaRouterAndroid : public MediaRouter {
scoped_ptr<base::ObserverList<MediaSinksObserver>>>;
MediaSinkObservers sinks_observers_;
+ struct CreateMediaRouteRequest {
+ CreateMediaRouteRequest(
+ const MediaSource& source,
+ const MediaSink& sink,
+ const std::string& presentation_id,
+ const std::vector<MediaRouteResponseCallback>& callbacks);
+ ~CreateMediaRouteRequest();
+
+ MediaSource media_source;
+ MediaSink media_sink;
+ std::string presentation_id;
+ std::vector<MediaRouteResponseCallback> callbacks;
+ };
+
+ using CreateMediaRouteRequests =
+ IDMap<CreateMediaRouteRequest, IDMapOwnPointer>;
+ CreateMediaRouteRequests create_route_requests_;
+
DISALLOW_COPY_AND_ASSIGN(MediaRouterAndroid);
};

Powered by Google App Engine
This is Rietveld 408576698