| 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 } | 230 } |
| 231 | 231 |
| 232 void MediaRouterAndroid::AddIssue(const Issue& issue) { | 232 void MediaRouterAndroid::AddIssue(const Issue& issue) { |
| 233 NOTIMPLEMENTED(); | 233 NOTIMPLEMENTED(); |
| 234 } | 234 } |
| 235 | 235 |
| 236 void MediaRouterAndroid::ClearIssue(const Issue::Id& issue_id) { | 236 void MediaRouterAndroid::ClearIssue(const Issue::Id& issue_id) { |
| 237 NOTIMPLEMENTED(); | 237 NOTIMPLEMENTED(); |
| 238 } | 238 } |
| 239 | 239 |
| 240 void MediaRouterAndroid::OnUserGesture() { |
| 241 } |
| 242 |
| 240 void MediaRouterAndroid::DetachRoute(const MediaRoute::Id& route_id) { | 243 void MediaRouterAndroid::DetachRoute(const MediaRoute::Id& route_id) { |
| 241 JNIEnv* env = base::android::AttachCurrentThread(); | 244 JNIEnv* env = base::android::AttachCurrentThread(); |
| 242 ScopedJavaLocalRef<jstring> jroute_id = | 245 ScopedJavaLocalRef<jstring> jroute_id = |
| 243 base::android::ConvertUTF8ToJavaString(env, route_id); | 246 base::android::ConvertUTF8ToJavaString(env, route_id); |
| 244 Java_ChromeMediaRouter_detachRoute( | 247 Java_ChromeMediaRouter_detachRoute( |
| 245 env, java_media_router_.obj(), jroute_id.obj()); | 248 env, java_media_router_.obj(), jroute_id.obj()); |
| 246 } | 249 } |
| 247 | 250 |
| 248 bool MediaRouterAndroid::RegisterMediaSinksObserver( | 251 bool MediaRouterAndroid::RegisterMediaSinksObserver( |
| 249 MediaSinksObserver* observer) { | 252 MediaSinksObserver* observer) { |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 scoped_ptr<content::PresentationSessionMessage> message( | 454 scoped_ptr<content::PresentationSessionMessage> message( |
| 452 new content::PresentationSessionMessage(content::TEXT)); | 455 new content::PresentationSessionMessage(content::TEXT)); |
| 453 message->message = ConvertJavaStringToUTF8(env, jmessage); | 456 message->message = ConvertJavaStringToUTF8(env, jmessage); |
| 454 session_messages.push_back(std::move(message)); | 457 session_messages.push_back(std::move(message)); |
| 455 | 458 |
| 456 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list, | 459 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list, |
| 457 OnMessagesReceived(session_messages, true)); | 460 OnMessagesReceived(session_messages, true)); |
| 458 } | 461 } |
| 459 | 462 |
| 460 } // namespace media_router | 463 } // namespace media_router |
| OLD | NEW |