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

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

Issue 1224093004: [Media Router] 2nd take on fix route response callback lifetime in UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test Created 5 years, 5 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 3569a725618677dc1c7c249fbc7c8f738036c805..725087e67e1a87b3294d6f9b75a6294cf659a708 100644
--- a/chrome/browser/media/router/media_router_mojo_impl.h
+++ b/chrome/browser/media/router/media_router_mojo_impl.h
@@ -58,16 +58,18 @@ class MediaRouterMojoImpl : public MediaRouter,
// MediaRouter implementation.
// Execution of the requests is delegated to the Do* methods, which can be
// enqueued for later use if the extension is temporarily suspended.
- void CreateRoute(const MediaSource::Id& source_id,
- const MediaSink::Id& sink_id,
- const GURL& origin,
- int tab_id,
- const MediaRouteResponseCallback& callback) override;
- void JoinRoute(const MediaSource::Id& source_id,
- const std::string& presentation_id,
- const GURL& origin,
- int tab_id,
- const MediaRouteResponseCallback& callback) override;
+ void CreateRoute(
+ const MediaSource::Id& source_id,
+ const MediaSink::Id& sink_id,
+ const GURL& origin,
+ int tab_id,
+ const std::vector<MediaRouteResponseCallback>& callbacks) override;
+ void JoinRoute(
+ const MediaSource::Id& source_id,
+ const std::string& presentation_id,
+ const GURL& origin,
+ int tab_id,
+ const std::vector<MediaRouteResponseCallback>& callbacks) override;
void CloseRoute(const MediaRoute::Id& route_id) override;
void SendRouteMessage(const MediaRoute::Id& route_id,
const std::string& message,
@@ -121,12 +123,12 @@ class MediaRouterMojoImpl : public MediaRouter,
const MediaSink::Id& sink_id,
const std::string& origin,
int tab_id,
- const MediaRouteResponseCallback& callback);
+ const std::vector<MediaRouteResponseCallback>& callbacks);
void DoJoinRoute(const MediaSource::Id& source_id,
const std::string& presentation_id,
const std::string& origin,
int tab_id,
- const MediaRouteResponseCallback& callback);
+ const std::vector<MediaRouteResponseCallback>& callbacks);
void DoCloseRoute(const MediaRoute::Id& route_id);
void DoSendSessionMessage(const MediaRoute::Id& route_id,
const std::string& message,
« no previous file with comments | « chrome/browser/media/router/media_router.gypi ('k') | chrome/browser/media/router/media_router_mojo_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698