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

Side by Side Diff: chrome/browser/media/android/router/media_router_android.cc

Issue 1883423002: [Android,MediaRouter,Cast] implement onterminate and onclose. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Enable more disabled tests Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/media/android/router/media_router_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 const JavaParamRef<jstring>& jmedia_route_id) { 432 const JavaParamRef<jstring>& jmedia_route_id) {
433 MediaRoute::Id route_id = ConvertJavaStringToUTF8(env, jmedia_route_id); 433 MediaRoute::Id route_id = ConvertJavaStringToUTF8(env, jmedia_route_id);
434 for (auto it = active_routes_.begin(); it != active_routes_.end(); ++it) 434 for (auto it = active_routes_.begin(); it != active_routes_.end(); ++it)
435 if (it->media_route_id() == route_id) { 435 if (it->media_route_id() == route_id) {
436 active_routes_.erase(it); 436 active_routes_.erase(it);
437 break; 437 break;
438 } 438 }
439 439
440 FOR_EACH_OBSERVER(MediaRoutesObserver, routes_observers_, 440 FOR_EACH_OBSERVER(MediaRoutesObserver, routes_observers_,
441 OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>())); 441 OnRoutesUpdated(active_routes_, std::vector<MediaRoute::Id>()));
442 NotifyPresentationConnectionStateChange(
443 route_id, content::PRESENTATION_CONNECTION_STATE_TERMINATED);
444 }
445
446 void MediaRouterAndroid::OnRouteClosedWithError(
447 JNIEnv* env,
448 const JavaParamRef<jobject>& obj,
449 const JavaParamRef<jstring>& jmedia_route_id,
450 const JavaParamRef<jstring>& jmessage) {
451 MediaRoute::Id route_id = ConvertJavaStringToUTF8(env, jmedia_route_id);
452 std::string message = ConvertJavaStringToUTF8(env, jmessage);
453 NotifyPresentationConnectionClose(
454 route_id,
455 content::PRESENTATION_CONNECTION_CLOSE_REASON_CONNECTION_ERROR,
456 message);
457
458 OnRouteClosed(env, obj, jmedia_route_id);
442 } 459 }
443 460
444 void MediaRouterAndroid::OnMessageSentResult(JNIEnv* env, 461 void MediaRouterAndroid::OnMessageSentResult(JNIEnv* env,
445 const JavaParamRef<jobject>& obj, 462 const JavaParamRef<jobject>& obj,
446 jboolean jsuccess, 463 jboolean jsuccess,
447 jint jcallback_id) { 464 jint jcallback_id) {
448 SendRouteMessageCallback* callback = message_callbacks_.Lookup(jcallback_id); 465 SendRouteMessageCallback* callback = message_callbacks_.Lookup(jcallback_id);
449 callback->Run(jsuccess); 466 callback->Run(jsuccess);
450 message_callbacks_.Remove(jcallback_id); 467 message_callbacks_.Remove(jcallback_id);
451 } 468 }
(...skipping 12 matching lines...) Expand all
464 std::unique_ptr<content::PresentationSessionMessage> message( 481 std::unique_ptr<content::PresentationSessionMessage> message(
465 new content::PresentationSessionMessage(content::TEXT)); 482 new content::PresentationSessionMessage(content::TEXT));
466 message->message = ConvertJavaStringToUTF8(env, jmessage); 483 message->message = ConvertJavaStringToUTF8(env, jmessage);
467 session_messages.push_back(std::move(message)); 484 session_messages.push_back(std::move(message));
468 485
469 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list, 486 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list,
470 OnMessagesReceived(session_messages, true)); 487 OnMessagesReceived(session_messages, true));
471 } 488 }
472 489
473 } // namespace media_router 490 } // namespace media_router
OLDNEW
« no previous file with comments | « chrome/browser/media/android/router/media_router_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698