Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/frame_service_registry', | 10 'content/public/renderer/frame_service_registry', |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 346 var secondaryActions = (issue.secondaryActions || []).map(function(e) { | 346 var secondaryActions = (issue.secondaryActions || []).map(function(e) { |
| 347 return issueActionToMojo_(e); | 347 return issueActionToMojo_(e); |
| 348 }); | 348 }); |
| 349 this.service_.onIssue(new mediaRouterMojom.Issue({ | 349 this.service_.onIssue(new mediaRouterMojom.Issue({ |
| 350 'route_id': issue.routeId, | 350 'route_id': issue.routeId, |
| 351 'severity': issueSeverityToMojo_(issue.severity), | 351 'severity': issueSeverityToMojo_(issue.severity), |
| 352 'title': issue.title, | 352 'title': issue.title, |
| 353 'message': issue.message, | 353 'message': issue.message, |
| 354 'default_action': issueActionToMojo_(issue.defaultAction), | 354 'default_action': issueActionToMojo_(issue.defaultAction), |
| 355 'secondary_actions': secondaryActions, | 355 'secondary_actions': secondaryActions, |
| 356 'help_url': issue.helpUrl, | 356 'help_page_id': issue.help_page_id, |
|
imcheng
2016/05/23 20:02:42
nit: issue.helpPageId.
apacible
2016/05/23 20:22:52
Done.
| |
| 357 'is_blocking': issue.isBlocking | 357 'is_blocking': issue.isBlocking |
| 358 })); | 358 })); |
| 359 }; | 359 }; |
| 360 | 360 |
| 361 /** | 361 /** |
| 362 * Called by the provider manager when the set of active routes | 362 * Called by the provider manager when the set of active routes |
| 363 * has been updated. | 363 * has been updated. |
| 364 * @param {!Array<MediaRoute>} routes The active set of media routes. | 364 * @param {!Array<MediaRoute>} routes The active set of media routes. |
| 365 * @param {string=} opt_sourceUrn The sourceUrn associated with this route | 365 * @param {string=} opt_sourceUrn The sourceUrn associated with this route |
| 366 * query. This parameter is optional and can be empty. | 366 * query. This parameter is optional and can be empty. |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 814 }; | 814 }; |
| 815 | 815 |
| 816 mediaRouter = new MediaRouter(connector.bindHandleToProxy( | 816 mediaRouter = new MediaRouter(connector.bindHandleToProxy( |
| 817 serviceProvider.connectToService( | 817 serviceProvider.connectToService( |
| 818 mediaRouterMojom.MediaRouter.name), | 818 mediaRouterMojom.MediaRouter.name), |
| 819 mediaRouterMojom.MediaRouter)); | 819 mediaRouterMojom.MediaRouter)); |
| 820 | 820 |
| 821 return mediaRouter; | 821 return mediaRouter; |
| 822 }); | 822 }); |
| 823 | 823 |
| OLD | NEW |