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

Unified Diff: chrome/browser/resources/media_router/elements/route_details/route_details.html

Issue 2725503002: [Media Router] Custom Controls 4 - Implement details view WebUI (Closed)
Patch Set: Fix a test Created 3 years, 8 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
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..d05eae3ae4956d0eb3c7ae88438939ee42421d1f 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,20 @@
<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="../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$="[[!shouldShowRouteInfo_(useNewRouteControls, isExtensionViewHidden_)]]">
<span>[[activityStatus_]]</span>
</div>
<extensionview id="custom-controller"
- hidden$="[[isCustomControllerHidden_]]">
+ hidden$="[[!shouldShowExtensionView_(useNewRouteControls, isExtensionViewHidden_)]]">
mark a. foltz 2017/05/03 21:27:01 Does <hidden> prevent instantiation of the <extens
takumif 2017/05/05 18:57:40 <template is="dom-if"> seems to do that. But it ma
</extensionview>
+ <route-controls id="route-controls" hidden$="[[!useNewRouteControls]]">
+ </route-controls>
<div id="route-action-buttons" class="layout">
<paper-button flat class="route-button button"
id="start-casting-to-route-button"

Powered by Google App Engine
This is Rietveld 408576698