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

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: Fixing ChromeOS System Tray Test Created 4 years, 11 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 980fedab21cab9ee08516fd6a63b313e88590dbc..350505d0c6d290e144bc85adad90c5c6062c1e1a 100644
--- a/chrome/browser/ui/ash/cast_config_delegate_media_router.cc
+++ b/chrome/browser/ui/ash/cast_config_delegate_media_router.cc
@@ -48,6 +48,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;
@@ -64,7 +65,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& unused_joinable_route_ids) override;
MediaSinks sinks_;
MediaRoutes routes_;
@@ -93,7 +95,9 @@ void CastDeviceCache::OnSinksReceived(const MediaSinks& sinks) {
cast_config_delegate_->RequestDeviceRefresh();
}
-void CastDeviceCache::OnRoutesUpdated(const MediaRoutes& routes) {
+void CastDeviceCache::OnRoutesUpdated(
+ const MediaRoutes& routes,
+ const MediaRouteIds& unused_joinable_route_ids) {
routes_ = routes;
cast_config_delegate_->RequestDeviceRefresh();
}

Powered by Google App Engine
This is Rietveld 408576698