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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2365743002: [MR UI] Add a wrapper div to the sink list and search results in the MR dialog (Closed)
Patch Set: Rebase, fix browser test Created 4 years, 2 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
« no previous file with comments | « chrome/browser/resources/media_router/elements/media_router_container/media_router_container.css ('k') | chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html
diff --git a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html
index 6234156c2c1ffaa18fe5be2aacd6c43324972e34..5f2cef2d1476a05598d821dc4b16a9ae556fb37d 100644
--- a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html
+++ b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html
@@ -107,45 +107,46 @@
</a>
</div>
<template is="dom-if" if="[[!computeSinkListHidden_(sinksToShow_)]]">
- <paper-menu id="sink-list" role="presentation"
- hidden$="[[hideSinkListForAnimation_]]">
- <template is="dom-repeat" id="sinkList" items="[[sinksToShow_]]">
- <paper-item on-tap="onSinkClick_">
- <div class="sink-content">
- <div>
- <iron-icon icon="[[computeSinkIcon_(item)]]"
- hidden$="[[computeSinkIsLaunching_(currentLaunchingSinkId_, item.id)]]"
- class$="[[computeSinkIconClass_(item.id, sinkToRouteMap_)]]">
- </iron-icon>
- <template is="dom-if"
- if="[[computeSinkIsLaunching_(currentLaunchingSinkId_, item.id)]]">
- <paper-spinner class="sink-icon" active>
- </paper-spinner>
- </template>
- </div>
- <div>
- <div class="sink-text">
- <span dir="auto" class="sink-name" title="[[item.name]]">
- [[item.name]]
- </span>
+ <div id="sink-list" hidden$="[[hideSinkListForAnimation_]]">
+ <paper-menu id="sink-list-paper-menu" role="presentation">
+ <template is="dom-repeat" id="sinkList" items="[[sinksToShow_]]">
+ <paper-item on-tap="onSinkClick_">
+ <div class="sink-content">
+ <div>
+ <iron-icon icon="[[computeSinkIcon_(item)]]"
+ hidden$="[[computeSinkIsLaunching_(currentLaunchingSinkId_, item.id)]]"
+ class$="[[computeSinkIconClass_(item.id, sinkToRouteMap_)]]">
+ </iron-icon>
<template is="dom-if"
- if="[[!computeSinkDomainHidden_(item)]]">
- <span class="sink-domain" title="[[item.domain]]">
- [[item.domain]]
- </span>
+ if="[[computeSinkIsLaunching_(currentLaunchingSinkId_, item.id)]]">
+ <paper-spinner class="sink-icon" active>
+ </paper-spinner>
</template>
</div>
- <template is="dom-if"
- if="[[!computeSinkSubtextHidden_(item, sinkToRouteMap_)]]">
- <div class="sink-text sink-subtext">
- <span>[[computeSinkSubtext_(item, sinkToRouteMap_)]]</span>
+ <div>
+ <div class="sink-text">
+ <span dir="auto" class="sink-name" title="[[item.name]]">
+ [[item.name]]
+ </span>
+ <template is="dom-if"
+ if="[[!computeSinkDomainHidden_(item)]]">
+ <span class="sink-domain" title="[[item.domain]]">
+ [[item.domain]]
+ </span>
+ </template>
</div>
- </template>
+ <template is="dom-if"
+ if="[[!computeSinkSubtextHidden_(item, sinkToRouteMap_)]]">
+ <div class="sink-text sink-subtext">
+ <span>[[computeSinkSubtext_(item, sinkToRouteMap_)]]</span>
+ </div>
+ </template>
+ </div>
</div>
- </div>
- </paper-item>
- </template>
- </paper-menu>
+ </paper-item>
+ </template>
+ </paper-menu>
+ </div>
</template>
<template is="dom-if" if="[[searchEnabled_]]">
<div id="sink-search">
@@ -169,49 +170,51 @@
hidden$="[[computeNoMatchesHidden_(searchResultsToShow_, isSearchListHidden_)]]">
<span>[[i18n('searchNoMatchesText')]]</span>
</div>
- <paper-menu id="search-results" selected="0" role="presentation"
+ <div id="search-results"
hidden$="[[computeSearchResultsHidden_(searchResultsToShow_, isSearchListHidden_)]]">
- <template is="dom-repeat" id="searchResults"
- items="[[searchResultsToShow_]]">
- <paper-item class="search-item" on-tap="onSinkClick_">
- <div class="sink-content">
- <div>
- <iron-icon icon="[[computeSinkIcon_(item.sinkItem)]]"
- hidden$="[[computeSinkIsLaunching_(currentLaunchingSinkId_, item.sinkItem.id)]]"
- class$="[[computeSinkIconClass_(item.sinkItem.id, sinkToRouteMap_)]]">
- </iron-icon>
- <template is="dom-if"
- if="[[computeSinkIsLaunching_(currentLaunchingSinkId_, item.sinkItem.id)]]">
- <paper-spinner class="sink-icon" active>
- </paper-spinner>
- </template>
- </div>
- <div>
- <div class="sink-text">
- <media-router-search-highlighter class="sink-name"
- data="[[computeSinkMatchingText_(item)]]"
- title="[[item.sinkItem.name]]">
- </media-router-search-highlighter>
+ <paper-menu id="search-results-paper-menu" selected="0" role="presentation">
+ <template is="dom-repeat" id="searchResults"
+ items="[[searchResultsToShow_]]">
+ <paper-item class="search-item" on-tap="onSinkClick_">
+ <div class="sink-content">
+ <div>
+ <iron-icon icon="[[computeSinkIcon_(item.sinkItem)]]"
+ hidden$="[[computeSinkIsLaunching_(currentLaunchingSinkId_, item.sinkItem.id)]]"
+ class$="[[computeSinkIconClass_(item.sinkItem.id, sinkToRouteMap_)]]">
+ </iron-icon>
<template is="dom-if"
- if="[[!computeSinkDomainHidden_(item.sinkItem)]]">
- <span class="sink-domain" title="[[item.sinkItem.domain]]">
- [[item.sinkItem.domain]]
- </span>
+ if="[[computeSinkIsLaunching_(currentLaunchingSinkId_, item.sinkItem.id)]]">
+ <paper-spinner class="sink-icon" active>
+ </paper-spinner>
</template>
</div>
- <template is="dom-if"
- if="[[!computeSinkSubtextHidden_(item.sinkItem, sinkToRouteMap_)]]">
- <div class="sink-text sink-subtext">
- <span>
- [[computeSinkSubtext_(item.sinkItem, sinkToRouteMap_)]]
- </span>
+ <div>
+ <div class="sink-text">
+ <media-router-search-highlighter class="sink-name"
+ data="[[computeSinkMatchingText_(item)]]"
+ title="[[item.sinkItem.name]]">
+ </media-router-search-highlighter>
+ <template is="dom-if"
+ if="[[!computeSinkDomainHidden_(item.sinkItem)]]">
+ <span class="sink-domain" title="[[item.sinkItem.domain]]">
+ [[item.sinkItem.domain]]
+ </span>
+ </template>
</div>
- </template>
+ <template is="dom-if"
+ if="[[!computeSinkSubtextHidden_(item.sinkItem, sinkToRouteMap_)]]">
+ <div class="sink-text sink-subtext">
+ <span>
+ [[computeSinkSubtext_(item.sinkItem, sinkToRouteMap_)]]
+ </span>
+ </div>
+ </template>
+ </div>
</div>
- </div>
- </paper-item>
- </template>
- </paper-menu>
+ </paper-item>
+ </template>
+ </paper-menu>
+ </div>
</div>
</template>
</div>
« no previous file with comments | « chrome/browser/resources/media_router/elements/media_router_container/media_router_container.css ('k') | chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698