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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « content/renderer/presentation/presentation_dispatcher.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 var mediaRouter; 5 var mediaRouter;
6 6
7 define('media_router_bindings', [ 7 define('media_router_bindings', [
8 'mojo/public/js/bindings', 8 'mojo/public/js/bindings',
9 'mojo/public/js/core', 9 'mojo/public/js/core',
10 'content/public/renderer/service_provider', 10 'content/public/renderer/service_provider',
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 /** 57 /**
58 * Converts a route message to a RouteMessage Mojo object. 58 * Converts a route message to a RouteMessage Mojo object.
59 * @param {!RouteMessage} message 59 * @param {!RouteMessage} message
60 * @return {!mediaRouterMojom.RouteMessage} A Mojo RouteMessage object. 60 * @return {!mediaRouterMojom.RouteMessage} A Mojo RouteMessage object.
61 */ 61 */
62 function messageToMojo_(message) { 62 function messageToMojo_(message) {
63 if ("string" == typeof message.message) { 63 if ("string" == typeof message.message) {
64 return new mediaRouterMojom.RouteMessage({ 64 return new mediaRouterMojom.RouteMessage({
65 'route_id': message.routeId, 65 'route_id': message.routeId,
66 'type': RouteMessage.Type.TEXT, 66 'type': mediaRouterMojom.RouteMessage.Type.TEXT,
67 'message': message.message, 67 'message': message.message,
68 }); 68 });
69 } else { 69 } else {
70 return new mediaRouterMojom.RouteMessage({ 70 return new mediaRouterMojom.RouteMessage({
71 'route_id': message.routeId, 71 'route_id': message.routeId,
72 'type': RouteMessage.Type.BINARY, 72 'type': mediaRouterMojom.RouteMessage.Type.BINARY,
73 'data': message.message, 73 'data': message.message,
74 }); 74 });
75 } 75 }
76 } 76 }
77 77
78 /** 78 /**
79 * Creates a new MediaRouter. 79 * Creates a new MediaRouter.
80 * Converts a route struct to its Mojo form. 80 * Converts a route struct to its Mojo form.
81 * @param {!MediaRouterService} service 81 * @param {!MediaRouterService} service
82 * @constructor 82 * @constructor
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 463
464 /** 464 /**
465 * Posts a message to the route designated by |routeId|. 465 * Posts a message to the route designated by |routeId|.
466 * @param {!string} routeId 466 * @param {!string} routeId
467 * @param {!string} message 467 * @param {!string} message
468 * @return {!Promise.<boolean>} Resolved with true if the message was sent, 468 * @return {!Promise.<boolean>} Resolved with true if the message was sent,
469 * or false on failure. 469 * or false on failure.
470 */ 470 */
471 MediaRouteProvider.prototype.sendRouteMessage = function( 471 MediaRouteProvider.prototype.sendRouteMessage = function(
472 routeId, message) { 472 routeId, message) {
473 this.handlers_.sendRouteMessage(routeId, message) 473 return this.handlers_.sendRouteMessage(routeId, message)
474 .then(function() { 474 .then(function() {
475 return true; 475 return true;
476 }, function() { 476 }, function() {
477 return false; 477 return false;
478 }); 478 });
479 }; 479 };
480 480
481 /** 481 /**
482 * Listen for next batch of messages from one of the routeIds. 482 * Listen for next batch of messages from one of the routeIds.
483 * @param {!Array.<string>} routeIds 483 * @param {!Array.<string>} routeIds
484 * @return {!Promise.<Array.<RouteMessage>>} Resolved with a list of messages, 484 * @return {!Promise.<Array.<RouteMessage>>} Resolved with a list of messages,
485 * an empty list if an error occurred. 485 * an empty list if an error occurred.
486 */ 486 */
487 MediaRouteProvider.prototype.listenForRouteMessages = function(routeIds) { 487 MediaRouteProvider.prototype.listenForRouteMessages = function(routeIds) {
488 this.handlers_.listenForRouteMessages(routeIds) 488 return this.handlers_.listenForRouteMessages(routeIds)
489 .then(function(messages) { 489 .then(function(messages) {
490 return messages.map(messageToMojo_); 490 return {'messages': messages.map(messageToMojo_)};
491 }, function() { 491 }, function() {
492 return []; 492 return {'messages': []};
493 }); 493 });
494 }; 494 };
495 495
496 /** 496 /**
497 * Requests that the provider manager start sending information about active 497 * Requests that the provider manager start sending information about active
498 * media routes to the Media Router. 498 * media routes to the Media Router.
499 */ 499 */
500 MediaRouteProvider.prototype.startObservingMediaRoutes = function() { 500 MediaRouteProvider.prototype.startObservingMediaRoutes = function() {
501 this.handlers_.startObservingMediaRoutes(); 501 this.handlers_.startObservingMediaRoutes();
502 }; 502 };
503 503
504 /** 504 /**
505 * Requests that the provider manager stop sending information about active 505 * Requests that the provider manager stop sending information about active
506 * media routes to the Media Router. 506 * media routes to the Media Router.
507 */ 507 */
508 MediaRouteProvider.prototype.stopObservingMediaRoutes = function() { 508 MediaRouteProvider.prototype.stopObservingMediaRoutes = function() {
509 this.handlers_.stopObservingMediaRoutes(); 509 this.handlers_.stopObservingMediaRoutes();
510 }; 510 };
511 511
512 mediaRouter = new MediaRouter(connector.bindHandleToProxy( 512 mediaRouter = new MediaRouter(connector.bindHandleToProxy(
513 serviceProvider.connectToService( 513 serviceProvider.connectToService(
514 mediaRouterMojom.MediaRouter.name), 514 mediaRouterMojom.MediaRouter.name),
515 mediaRouterMojom.MediaRouter)); 515 mediaRouterMojom.MediaRouter));
516 516
517 return mediaRouter; 517 return mediaRouter;
518 }); 518 });
519 519
OLDNEW
« 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