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

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

Issue 1383653002: MediaRouterAction: Only observe Media Routes when there is a local route. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
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 "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/guid.h" 9 #include "base/guid.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 PresentationSessionMessagesObserver* observer) { 269 PresentationSessionMessagesObserver* observer) {
270 const MediaRoute::Id& route_id = observer->route_id(); 270 const MediaRoute::Id& route_id = observer->route_id();
271 auto* observer_list = messages_observers_.get(route_id); 271 auto* observer_list = messages_observers_.get(route_id);
272 DCHECK(observer_list->HasObserver(observer)); 272 DCHECK(observer_list->HasObserver(observer));
273 273
274 observer_list->RemoveObserver(observer); 274 observer_list->RemoveObserver(observer);
275 if (!observer_list->might_have_observers()) 275 if (!observer_list->might_have_observers())
276 messages_observers_.erase(route_id); 276 messages_observers_.erase(route_id);
277 } 277 }
278 278
279 void MediaRouterAndroid::RegisterLocalMediaRoutesObserver(
280 LocalMediaRoutesObserver* observer) {
281 NOTIMPLEMENTED();
282 }
283
284 void MediaRouterAndroid::UnregisterLocalMediaRoutesObserver(
285 LocalMediaRoutesObserver* observer) {
286 NOTIMPLEMENTED();
287 }
288
279 void MediaRouterAndroid::OnSinksReceived( 289 void MediaRouterAndroid::OnSinksReceived(
280 JNIEnv* env, 290 JNIEnv* env,
281 jobject obj, 291 jobject obj,
282 jstring jsource_urn, 292 jstring jsource_urn,
283 jint jcount) { 293 jint jcount) {
284 std::vector<MediaSink> sinks_converted; 294 std::vector<MediaSink> sinks_converted;
285 sinks_converted.reserve(jcount); 295 sinks_converted.reserve(jcount);
286 for (int i = 0; i < jcount; ++i) { 296 for (int i = 0; i < jcount; ++i) {
287 ScopedJavaLocalRef<jstring> jsink_urn = 297 ScopedJavaLocalRef<jstring> jsink_urn =
288 Java_ChromeMediaRouter_getSinkUrn( 298 Java_ChromeMediaRouter_getSinkUrn(
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 scoped_ptr<content::PresentationSessionMessage> message( 391 scoped_ptr<content::PresentationSessionMessage> message(
382 new content::PresentationSessionMessage(content::TEXT)); 392 new content::PresentationSessionMessage(content::TEXT));
383 message->message = ConvertJavaStringToUTF8(env, jmessage); 393 message->message = ConvertJavaStringToUTF8(env, jmessage);
384 session_messages.push_back(message.Pass()); 394 session_messages.push_back(message.Pass());
385 395
386 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list, 396 FOR_EACH_OBSERVER(PresentationSessionMessagesObserver, *observer_list,
387 OnMessagesReceived(session_messages, true)); 397 OnMessagesReceived(session_messages, true));
388 } 398 }
389 399
390 } // namespace media_router 400 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698