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

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

Issue 1314413005: [Presentation API] 1-UA presentation support + presenter APIs. (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.cc
diff --git a/chrome/browser/media/router/media_router_mojo_impl.cc b/chrome/browser/media/router/media_router_mojo_impl.cc
index a4546fdc464fa24c83929bcd4ec690c31846d50c..2d7f3befad5a729b4cf388ac7fb0a88a2ac7e860 100644
--- a/chrome/browser/media/router/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/media_router_mojo_impl.cc
@@ -32,7 +32,8 @@ void RouteResponseReceived(
const std::string& presentation_id,
const std::vector<MediaRouteResponseCallback>& callbacks,
interfaces::MediaRoutePtr media_route,
- const mojo::String& error_text) {
+ const mojo::String& error_text,
+ bool is_one_ua_presentation) {
scoped_ptr<MediaRoute> route;
std::string actual_presentation_id;
std::string error;
@@ -46,7 +47,8 @@ void RouteResponseReceived(
}
for (const MediaRouteResponseCallback& callback : callbacks)
- callback.Run(route.get(), actual_presentation_id, error);
+ callback.Run(route.get(), actual_presentation_id, error,
+ is_one_ua_presentation);
}
// TODO(imcheng): We should handle failure in this case. One way is to invoke
@@ -202,7 +204,7 @@ void MediaRouterMojoImpl::CreateRoute(
if (!origin.is_valid()) {
DVLOG_WITH_INSTANCE(1) << "Invalid origin: " << origin;
for (const MediaRouteResponseCallback& callback : callbacks)
- callback.Run(nullptr, "", "Invalid origin");
+ callback.Run(nullptr, "", "Invalid origin", false);
return;
}
RunOrDefer(base::Bind(
@@ -221,7 +223,7 @@ void MediaRouterMojoImpl::JoinRoute(
if (!origin.is_valid()) {
DVLOG_WITH_INSTANCE(1) << "Invalid origin: " << origin;
for (const MediaRouteResponseCallback& callback : callbacks)
- callback.Run(nullptr, "", "Invalid origin");
+ callback.Run(nullptr, "", "Invalid origin", false);
return;
}
RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoJoinRoute,

Powered by Google App Engine
This is Rietveld 408576698