[Media Router] Allow casting new media to sink with existing route.

chrome/browser/resources/media_router/media_router.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 <include src="media_router_data.js">
 <include src="media_router_ui_interface.js">
 
 // Handles user events for the Media Router UI.
 cr.define('media_router', function() {
   'use strict';
@@ skipping 19 matching lines @@
     media_router.ui.setElements(container,
         /** @type {!MediaRouterHeaderElement} */
         (container.$['container-header']));
 
     container.addEventListener('acknowledge-first-run-flow',
                                onAcknowledgeFirstRunFlow);
     container.addEventListener('back-click', onNavigateToSinkList);
     container.addEventListener('cast-mode-selected', onCastModeSelected);
     container.addEventListener('close-dialog', onCloseDialog);
     container.addEventListener('close-route-click', onCloseRouteClick);
+    container.addEventListener('close-route-for-new-media', onCloseRouteClick);
     container.addEventListener('create-route', onCreateRoute);
     container.addEventListener('issue-action-click', onIssueActionClick);
+    container.addEventListener('join-route-click', onJoinRouteClick);
     container.addEventListener('navigate-sink-list-to-details',
                                onNavigateToDetails);
     container.addEventListener('navigate-to-cast-mode-list',
                                onNavigateToCastMode);
     container.addEventListener('report-filter', onFilter);
     container.addEventListener('report-initial-action', onInitialAction);
     container.addEventListener('report-initial-action-close',
                                onInitialActionClose);
     container.addEventListener('report-route-creation', onReportRouteCreation);
     container.addEventListener('report-sink-click-time',
                                onSinkClickTimeReported);
     container.addEventListener('report-sink-count', onSinkCountReported);
     container.addEventListener('report-resolved-route',
                                onReportRouteCreationOutcome);
     container.addEventListener('request-initial-data',
                                onRequestInitialData);
     container.addEventListener('search-sinks-and-create-route',
                                onSearchSinksAndCreateRoute);
     container.addEventListener('show-initial-state', onShowInitialState);
     container.addEventListener('sink-click', onSinkClick);
-    container.addEventListener('start-casting-to-route-click',
-                               onStartCastingToRouteClick);
 
     window.addEventListener('blur', onWindowBlur);
   }
 
   /**
    * Requests that the Media Router searches for a sink with criteria
    * |event.detail.name|.
    * @param {!Event} event
    * Parameters in |event|.detail:
    *   id - id of the pseudo sink generating the request.
@@ skipping 141 matching lines @@
    *   route - The route to close.
    */
   function onCloseRouteClick(event) {
     /** @type {{route: !media_router.Route}} */
     var detail = event.detail;
     media_router.browserApi.closeRoute(detail.route);
   }
 
   /**
    * Starts casting to an existing route.
-   * Called when the user requests to start casting to a media route.
+   * Called when the user requests to start casting to a media route that is
+   * joinable.
    *
    * @param {!Event} event
    * Parameters in |event|.detail:
    *   route - The route to connect to if possible.
    */
-  function onStartCastingToRouteClick(event) {
+  function onJoinRouteClick(event) {
     /** @type {{route: !media_router.Route}} */
     var detail = event.detail;
     media_router.browserApi.joinRoute(detail.route);
   }
 
   /**
    * Reports the user navigation to the cast mode view.
    * Called when the user clicks the drop arrow to navigate to the cast mode
    * view on the dialog.
    */
@@ skipping 120 matching lines @@
   function onWindowBlur() {
     media_router.browserApi.reportBlur();
   }
 
   return {
     initialize: initialize,
   };
 });
 
 window.addEventListener('load', media_router.initialize);