extensions/renderer/resources/media_router_bindings.js - Issue 2145983003: [Media Router] Adds return value to mojo MediaRouteProvider::TerminateRoute.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/renderer/resources/media_router_bindings.js

Issue 2145983003: [Media Router] Adds return value to mojo MediaRouteProvider::TerminateRoute. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Initial patch Created 4 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

« chrome/browser/media/router/mojo/media_router_mojo_metrics.cc ('K') | « chrome/browser/media/router/route_request_result.h ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/renderer/resources/media_router_bindings.js

diff --git a/extensions/renderer/resources/media_router_bindings.js b/extensions/renderer/resources/media_router_bindings.js

index 86ea2173273d3493db74a10456731a3f580ef5a0..659a05e05dc1601306cc4e8c533ad42fcbb9f017 100644

--- a/extensions/renderer/resources/media_router_bindings.js

+++ b/extensions/renderer/resources/media_router_bindings.js

@@ -677,7 +677,17 @@ define('media_router_bindings', [

* @param {!string} routeId

MediaRouteProvider.prototype.terminateRoute = function(routeId) {

- this.handlers_.terminateRoute(routeId);

+ // TODO(crbug.com/627967): Remove code path that doesn't expect a Promise

+ // in M56

apacible 2016/07/14 16:46:36 nitty nit: period at the end of this line.

mark a. foltz 2016/07/15 20:03:36 Done.

+ var maybePromise = this.handlers_.terminateRoute(routeId);

+ var successResult = {result_code: RouteRequestResultCode.OK};

+ if (maybePromise) {

+ maybePromise.then(

+ function() { return successResult; },

+ function(err) { return toErrorRouteResponse_(err); });

apacible 2016/07/14 16:46:36 Styling preference: move closing ");" to separate

mark a. foltz 2016/07/15 20:03:36 Done.

+ } else {

+ return successResult;

+ }

};

/**