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

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

Issue 1202963004: Gets presentation ID from route ID upon route creation, and overrides previous presentation ID with… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « content/renderer/presentation/presentation_dispatcher.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 ade2ee8c697fd4971eef7d7bd2b12a11414f3042..eb0d35539f2c3ff87f0e6dedceabe2576bd595e5 100644
--- a/extensions/renderer/resources/media_router_bindings.js
+++ b/extensions/renderer/resources/media_router_bindings.js
@@ -63,13 +63,13 @@ define('media_router_bindings', [
if ("string" == typeof message.message) {
return new mediaRouterMojom.RouteMessage({
'route_id': message.routeId,
- 'type': RouteMessage.Type.TEXT,
+ 'type': mediaRouterMojom.RouteMessage.Type.TEXT,
'message': message.message,
});
} else {
return new mediaRouterMojom.RouteMessage({
'route_id': message.routeId,
- 'type': RouteMessage.Type.BINARY,
+ 'type': mediaRouterMojom.RouteMessage.Type.BINARY,
'data': message.message,
});
}
@@ -470,7 +470,7 @@ define('media_router_bindings', [
*/
MediaRouteProvider.prototype.sendRouteMessage = function(
routeId, message) {
- this.handlers_.sendRouteMessage(routeId, message)
+ return this.handlers_.sendRouteMessage(routeId, message)
.then(function() {
return true;
}, function() {
@@ -485,11 +485,11 @@ define('media_router_bindings', [
* an empty list if an error occurred.
*/
MediaRouteProvider.prototype.listenForRouteMessages = function(routeIds) {
- this.handlers_.listenForRouteMessages(routeIds)
+ return this.handlers_.listenForRouteMessages(routeIds)
.then(function(messages) {
- return messages.map(messageToMojo_);
+ return {'messages': messages.map(messageToMojo_)};
}, function() {
- return [];
+ return {'messages': []};
});
};
« no previous file with comments | « content/renderer/presentation/presentation_dispatcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698