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

Unified Diff: chrome/browser/ui/ash/cast_config_delegate_media_router.cc

Issue 1415103006: Non-Local Join for Media Router and Presentation API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Backwards Compatibility Created 4 years, 12 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/cast_config_delegate_media_router.cc
diff --git a/chrome/browser/ui/ash/cast_config_delegate_media_router.cc b/chrome/browser/ui/ash/cast_config_delegate_media_router.cc
index 7a9dbcee953cab290ec0b17c180a5608ef481ce5..506035f578c1ebd772ab70d3998eb4e346d5f602 100644
--- a/chrome/browser/ui/ash/cast_config_delegate_media_router.cc
+++ b/chrome/browser/ui/ash/cast_config_delegate_media_router.cc
@@ -46,6 +46,7 @@ class CastDeviceCache : public media_router::MediaRoutesObserver,
public:
using MediaSinks = std::vector<media_router::MediaSink>;
using MediaRoutes = std::vector<media_router::MediaRoute>;
+ using MediaRouteIds = std::vector<media_router::MediaRoute::Id>;
explicit CastDeviceCache(ash::CastConfigDelegate* cast_config_delegate);
~CastDeviceCache() override;
@@ -58,7 +59,8 @@ class CastDeviceCache : public media_router::MediaRoutesObserver,
void OnSinksReceived(const MediaSinks& sinks) override;
// media_router::MediaRoutesObserver:
- void OnRoutesUpdated(const MediaRoutes& routes) override;
+ void OnRoutesUpdated(const MediaRoutes& routes,
+ const MediaRouteIds& joinable_route_ids) override;
MediaSinks sinks_;
MediaRoutes routes_;
@@ -84,7 +86,8 @@ void CastDeviceCache::OnSinksReceived(const MediaSinks& sinks) {
cast_config_delegate_->RequestDeviceRefresh();
}
-void CastDeviceCache::OnRoutesUpdated(const MediaRoutes& routes) {
+void CastDeviceCache::OnRoutesUpdated(const MediaRoutes& routes,
+ const MediaRouteIds& joinable_route_ids) {
stevenjb 2016/01/05 20:10:23 unused_joinable_route_ids
matt.boetger 2016/01/06 22:49:07 Done.
routes_ = routes;
cast_config_delegate_->RequestDeviceRefresh();
}

Powered by Google App Engine
This is Rietveld 408576698