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

Unified Diff: chrome/browser/media/router/media_router_mojo_impl.h

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, 3 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/media/router/media_router_mojo_impl.h
diff --git a/chrome/browser/media/router/media_router_mojo_impl.h b/chrome/browser/media/router/media_router_mojo_impl.h
index a344e83c4445c78bfd79b0b27c64d662c914d43d..93e5e5937964352726c3dd6d42d16150cd921945 100644
--- a/chrome/browser/media/router/media_router_mojo_impl.h
+++ b/chrome/browser/media/router/media_router_mojo_impl.h
@@ -138,6 +138,10 @@ class MediaRouterMojoImpl : public MediaRouter,
PresentationSessionMessagesObserver* observer) override;
void UnregisterPresentationSessionMessagesObserver(
PresentationSessionMessagesObserver* observer) override;
+ void RegisterLocalMediaRoutesObserver(
+ LocalMediaRoutesObserver* observer) override;
+ void UnregisterLocalMediaRoutesObserver(
+ LocalMediaRoutesObserver* observer) override;
// These calls invoke methods in the component extension via Mojo.
void DoCreateRoute(const MediaSource::Id& source_id,
@@ -187,6 +191,14 @@ class MediaRouterMojoImpl : public MediaRouter,
mojo::Array<interfaces::MediaSinkPtr> sinks) override;
void OnRoutesUpdated(mojo::Array<interfaces::MediaRoutePtr> routes) override;
+ // Converts the callback result of calling Mojo CreateRoute()/JoinRoute()
+ // into a local callback.
+ void RouteResponseReceived(
+ const std::string& presentation_id,
+ const std::vector<MediaRouteResponseCallback>& callbacks,
+ interfaces::MediaRoutePtr media_route,
+ const mojo::String& error_text);
+
// Pending requests queued to be executed once component extension
// becomes ready.
std::vector<base::Closure> pending_requests_;
@@ -195,6 +207,8 @@ class MediaRouterMojoImpl : public MediaRouter,
scoped_ptr<base::ObserverList<MediaSinksObserver>>>
sinks_observers_;
+ base::ObserverList<LocalMediaRoutesObserver> local_routes_observers_;
+
base::ObserverList<MediaRoutesObserver> routes_observers_;
using PresentationSessionMessagesObserverList =

Powered by Google App Engine
This is Rietveld 408576698