diff options
3 files changed, 22 insertions, 1 deletions
diff --git a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.css b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.css index abcb061..e5ec64f 100644 --- a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.css +++ b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.css @@ -176,12 +176,20 @@ paper-menu { /* TODO(crbug/589697): Handle overflow of very long domain names. */ } +#sink-list { + padding-bottom: 0; +} + .sink-name { min-width: 10%; overflow: hidden; text-overflow: ellipsis; } +#sink-search.bottom { + padding-bottom: 16px; +} + /* Separate icon class is a consequence of box-sizing: border-box set by * paper-icon-button. This should achieve the same dimensions as .sink-icon. */ 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 17cbb48..ebe34f3 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 @@ -143,7 +143,7 @@ </paper-item> </template> </paper-menu> - <div id="sink-search"> + <div id="sink-search" class$="[[computeSinkSearchClass_(currentView_)]]"> <div class="sink-content"> <div> <paper-icon-button id="sink-search-icon" icon="search" diff --git a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js index c84092d..b99b88a 100644 --- a/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js +++ b/chrome/browser/resources/media_router/elements/media_router_container/media_router_container.js @@ -1018,6 +1018,19 @@ Polymer({ }, /** + * Computes the CSS class for #sink-search depending on whether it is the + * first or last item in the list, as indicated by |currentView|. + * @param {?media_router.MediaRouterView} currentView The current view of the + * dialog. + * @return {string} The CSS that correctly sets the padding of #sink-search + * for the current view. + * @private + */ + computeSinkSearchClass_: function(currentView) { + return (currentView == media_router.MediaRouterView.FILTER) ? '' : 'bottom'; + }, + + /** * Returns the subtext to be shown for |sink|. Only called if * |computeSinkSubtextHidden_| returns false for the same |sink| and * |sinkToRouteMap|. |