Chromium Code Reviews| Index: chrome/browser/resources/media_router/elements/route_details/route_details.html |
| diff --git a/chrome/browser/resources/media_router/elements/route_details/route_details.html b/chrome/browser/resources/media_router/elements/route_details/route_details.html |
| index 61043b440754fe8722df8a78cdedfe05eae796e2..1798225158bb2004a3ba43a23c06789d079bb17a 100644 |
| --- a/chrome/browser/resources/media_router/elements/route_details/route_details.html |
| +++ b/chrome/browser/resources/media_router/elements/route_details/route_details.html |
| @@ -1,16 +1,25 @@ |
| <link rel="import" href="chrome://resources/html/polymer.html"> |
| <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> |
| +<link rel="import" href="extension_view_wrapper/extension_view_wrapper.html"> |
| +<link rel="import" href="../route_controls/route_controls.html"> |
| <dom-module id="route-details"> |
| <link rel="import" type="css" href="../../media_router_common.css"> |
| <link rel="import" type="css" href="route_details.css"> |
| <template> |
| - <div id="route-information" hidden$="[[!isCustomControllerHidden_]]"> |
| + <div id="route-information" |
| + hidden$="[[!shouldShowRouteInfoOnly_(controllerType_)]]"> |
| <span>[[activityStatus_]]</span> |
| </div> |
| - <extensionview id="custom-controller" |
| - hidden$="[[isCustomControllerHidden_]]"> |
| - </extensionview> |
| + <template is="dom-if" if="[[!useWebUiRouteControls]]"> |
| + <extension-view-wrapper id="extension-view-wrapper" route="[[route]]" |
| + is-extension-view-ready="{{isExtensionViewReady}}" |
| + hidden$="[[!shouldShowExtensionView_(controllerType_)]]"> |
| + </extension-view-wrapper> |
| + </template> |
| + <route-controls id="route-controls" |
|
apacible
2017/05/17 21:52:17
What are the pros/cons of keeping <route-controls>
takumif
2017/05/18 18:01:55
Actually, since we'll be comparing the load times
apacible
2017/05/24 20:28:26
SGTM.
|
| + hidden$="[[!shouldShowWebUiControls_(controllerType_)]]"> |
| + </route-controls> |
| <div id="route-action-buttons" class="layout"> |
| <paper-button flat class="route-button button" |
| id="start-casting-to-route-button" |