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

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

Issue 2706463002: [Presentation API] Mojo typemap for content::PresentationConnectionMessage (Closed)
Patch Set: Remove TODO 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/android/router/media_router_android.cc
diff --git a/chrome/browser/media/android/router/media_router_android.cc b/chrome/browser/media/android/router/media_router_android.cc
index 91cae709091fe5e8e95c1660da7ee28fe03b6a24..c81ee84e52421d41a8a75c3094a3dff87c702820 100644
--- a/chrome/browser/media/android/router/media_router_android.cc
+++ b/chrome/browser/media/android/router/media_router_android.cc
@@ -167,7 +167,7 @@ void MediaRouterAndroid::TerminateRoute(const MediaRoute::Id& route_id) {
void MediaRouterAndroid::SendRouteMessage(
const MediaRoute::Id& route_id,
- const std::string& message,
+ std::string message,
const SendRouteMessageCallback& callback) {
int callback_id = message_callbacks_.Add(
base::MakeUnique<SendRouteMessageCallback>(callback));
@@ -182,15 +182,16 @@ void MediaRouterAndroid::SendRouteMessage(
void MediaRouterAndroid::SendRouteBinaryMessage(
const MediaRoute::Id& route_id,
- std::unique_ptr<std::vector<uint8_t>> data,
+ std::vector<uint8_t> data,
const SendRouteMessageCallback& callback) {
+ // TODO(crbug.com/524128): Remove support for binary messaging.
int callback_id = message_callbacks_.Add(
base::MakeUnique<SendRouteMessageCallback>(callback));
JNIEnv* env = base::android::AttachCurrentThread();
ScopedJavaLocalRef<jstring> jroute_id =
base::android::ConvertUTF8ToJavaString(env, route_id);
ScopedJavaLocalRef<jbyteArray> jbyte_array =
- base::android::ToJavaByteArray(env, &((*data)[0]), data->size());
+ base::android::ToJavaByteArray(env, &(data[0]), data.size());
Java_ChromeMediaRouter_sendBinaryMessage(env, java_media_router_, jroute_id,
jbyte_array, callback_id);
}

Powered by Google App Engine
This is Rietveld 408576698