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

Unified Diff: chrome/browser/ui/webui/media_router/media_router_ui.cc

Issue 1259073004: [Presentation API] Change ListenForSessionMessages API to client-style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update comments Created 5 years, 4 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/webui/media_router/media_router_ui.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc
index 8d717f5baf704283faa881c461c667549cd98167..9c50fae4275d44e2d1e4fca928938f55c78dedc9 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
@@ -38,13 +38,15 @@ namespace {
void HandleRouteResponseForPresentationApi(
scoped_ptr<CreatePresentationSessionRequest> presentation_request,
const MediaRoute* route,
+ const std::string& presentation_id,
const std::string& error) {
DCHECK(presentation_request);
if (!route) {
presentation_request->MaybeInvokeErrorCallback(
content::PresentationError(content::PRESENTATION_ERROR_UNKNOWN, error));
} else {
- presentation_request->MaybeInvokeSuccessCallback(route->media_route_id());
+ presentation_request->MaybeInvokeSuccessCallback(presentation_id,
+ route->media_route_id());
}
}
@@ -282,6 +284,7 @@ void MediaRouterUI::OnRoutesUpdated(const std::vector<MediaRoute>& routes) {
}
void MediaRouterUI::OnRouteResponseReceived(const MediaRoute* route,
+ const std::string& presentation_id,
const std::string& error) {
DVLOG(1) << "OnRouteResponseReceived";
// TODO(imcheng): Display error in UI. (crbug.com/490372)
« no previous file with comments | « chrome/browser/ui/webui/media_router/media_router_ui.h ('k') | chrome/test/media_router/media_router_e2e_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698