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

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

Issue 1294133002: [Presentation API, MediaRouter] Routing from media sink selection to route creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media-router-discovery-2
Patch Set: Fixed comments and naming and DCHECKs 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
« no previous file with comments | « chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1ef0321a4f9fcf799943fc3453f827e3a1fda035..af9f21bbbe6e0d75940d247996358f0912213ed6 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc
@@ -35,21 +35,6 @@ namespace media_router {
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(presentation_id,
- route->media_route_id());
- }
-}
-
std::string GetHostFromURL(const GURL& gurl) {
if (gurl.is_empty())
return std::string();
@@ -350,7 +335,7 @@ bool MediaRouterUI::DoCreateRoute(const MediaSink::Id& sink_id,
// |presentation_request_| will be nullptr after this call, as the
// object will be transferred to the callback.
route_response_callbacks.push_back(
- base::Bind(&HandleRouteResponseForPresentationApi,
+ base::Bind(&CreatePresentationSessionRequest::HandleRouteResponse,
base::Passed(&presentation_request_)));
} else if (presentation_service_delegate_) {
route_response_callbacks.push_back(
« no previous file with comments | « chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698