| OLD | NEW |
| 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 #include "chrome/browser/media/android/router/media_router_android.h" | 5 #include "chrome/browser/media/android/router/media_router_android.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 ScopedJavaLocalRef<jstring> jmessage = | 177 ScopedJavaLocalRef<jstring> jmessage = |
| 178 base::android::ConvertUTF8ToJavaString(env, message); | 178 base::android::ConvertUTF8ToJavaString(env, message); |
| 179 Java_ChromeMediaRouter_sendStringMessage(env, java_media_router_, jroute_id, | 179 Java_ChromeMediaRouter_sendStringMessage(env, java_media_router_, jroute_id, |
| 180 jmessage, callback_id); | 180 jmessage, callback_id); |
| 181 } | 181 } |
| 182 | 182 |
| 183 void MediaRouterAndroid::SendRouteBinaryMessage( | 183 void MediaRouterAndroid::SendRouteBinaryMessage( |
| 184 const MediaRoute::Id& route_id, | 184 const MediaRoute::Id& route_id, |
| 185 std::unique_ptr<std::vector<uint8_t>> data, | 185 std::unique_ptr<std::vector<uint8_t>> data, |
| 186 const SendRouteMessageCallback& callback) { | 186 const SendRouteMessageCallback& callback) { |
| 187 // Binary messaging is not supported on Android. | 187 int callback_id = message_callbacks_.Add( |
| 188 callback.Run(false); | 188 base::MakeUnique<SendRouteMessageCallback>(callback)); |
| 189 JNIEnv* env = base::android::AttachCurrentThread(); |
| 190 ScopedJavaLocalRef<jstring> jroute_id = |
| 191 base::android::ConvertUTF8ToJavaString(env, route_id); |
| 192 ScopedJavaLocalRef<jbyteArray> jbyte_array = |
| 193 base::android::ToJavaByteArray(env, &((*data)[0]), data->size()); |
| 194 Java_ChromeMediaRouter_sendBinaryMessage(env, java_media_router_, jroute_id, |
| 195 jbyte_array, callback_id); |
| 189 } | 196 } |
| 190 | 197 |
| 191 void MediaRouterAndroid::AddIssue(const IssueInfo& issue_info) { | 198 void MediaRouterAndroid::AddIssue(const IssueInfo& issue_info) { |
| 192 NOTIMPLEMENTED(); | 199 NOTIMPLEMENTED(); |
| 193 } | 200 } |
| 194 | 201 |
| 195 void MediaRouterAndroid::ClearIssue(const Issue::Id& issue_id) { | 202 void MediaRouterAndroid::ClearIssue(const Issue::Id& issue_id) { |
| 196 NOTIMPLEMENTED(); | 203 NOTIMPLEMENTED(); |
| 197 } | 204 } |
| 198 | 205 |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 return; | 438 return; |
| 432 | 439 |
| 433 std::vector<RouteMessage> messages(1); | 440 std::vector<RouteMessage> messages(1); |
| 434 messages.front().type = RouteMessage::TEXT; | 441 messages.front().type = RouteMessage::TEXT; |
| 435 messages.front().text = ConvertJavaStringToUTF8(env, jmessage); | 442 messages.front().text = ConvertJavaStringToUTF8(env, jmessage); |
| 436 for (auto& observer : *it->second.get()) | 443 for (auto& observer : *it->second.get()) |
| 437 observer.OnMessagesReceived(messages); | 444 observer.OnMessagesReceived(messages); |
| 438 } | 445 } |
| 439 | 446 |
| 440 } // namespace media_router | 447 } // namespace media_router |
| OLD | NEW |