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 <utility> |
| 8 |
7 #include "base/android/context_utils.h" | 9 #include "base/android/context_utils.h" |
8 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
9 #include "base/android/jni_array.h" | 11 #include "base/android/jni_array.h" |
10 #include "base/android/jni_string.h" | 12 #include "base/android/jni_string.h" |
11 #include "base/guid.h" | 13 #include "base/guid.h" |
12 #include "base/logging.h" | 14 #include "base/logging.h" |
13 #include "base/memory/scoped_vector.h" | 15 #include "base/memory/scoped_vector.h" |
14 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
15 #include "chrome/browser/android/tab_android.h" | 17 #include "chrome/browser/android/tab_android.h" |
16 #include "chrome/browser/media/router/media_routes_observer.h" | 18 #include "chrome/browser/media/router/media_routes_observer.h" |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 const JavaParamRef<jstring>& jmessage) { | 426 const JavaParamRef<jstring>& jmessage) { |
425 MediaRoute::Id route_id = ConvertJavaStringToUTF8(env, jmedia_route_id); | 427 MediaRoute::Id route_id = ConvertJavaStringToUTF8(env, jmedia_route_id); |
426 auto* observer_list = messages_observers_.get(route_id); | 428 auto* observer_list = messages_observers_.get(route_id); |
427 if (!observer_list) | 429 if (!observer_list) |
428 return; | 430 return; |
429 | 431 |
430 ScopedVector<content::PresentationSessionMessage> session_messages; | 432 ScopedVector<content::PresentationSessionMessage> session_messages; |
431 scoped_ptr<content::PresentationSessionMessage> message( | 433 scoped_ptr<content::PresentationSessionMessage> message( |
432 new content::PresentationSessionMessage(content::TEXT)); | 434 new content::PresentationSessionMessage(content::TEXT)); |
433 message->message = ConvertJavaStringToUTF8(env, jmessage); | 435 message->message = ConvertJavaStringToUTF8(env, jmessage); |
434 session_messages.push_back(message.Pass()); | 436 session_messages.push_back(std::move(message)); |
435 | 437 |
436 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list, | 438 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list, |
437 OnMessagesReceived(session_messages, true)); | 439 OnMessagesReceived(session_messages, true)); |
438 } | 440 } |
439 | 441 |
440 } // namespace media_router | 442 } // namespace media_router |
OLD | NEW |