| commit | 75f515b07a49e9ce41c45a77cfafcf60f9364827 | [log] [tgz] |
|---|---|---|
| author | apacible <[email protected]> | Wed Sep 23 06:18:14 2015 |
| committer | Commit bot <[email protected]> | Wed Sep 23 06:19:21 2015 |
| tree | 356ce9d5e84daf11fd12dbeeb49f25a0a05802b8 | |
| parent | 0c29a4a88da7b2e6b7a72ad44bde52af491f0002 [diff] |
[Media Router] Allow dialog to handle variable numbers of sinks. Previously, the dialog would always stay the size of at least 5 sinks. This change allows the dialog to shrink if there are less than 5 sinks available. If there are zero sinks, the "Device missing?" text is shown. BUG=525338 Review URL: https://codereview.chromium.org/1349503006 Cr-Commit-Position: refs/heads/master@{#350318}
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 62f29c2..278cc9ff 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
@@ -118,7 +118,7 @@ #sink-list { max-height: 200px; overflow-x: hidden; - overflow-y: scroll; + overflow-y: auto; } .sink-text {
diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc index e41268e..862cbd4 100644 --- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc +++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc
@@ -36,7 +36,7 @@ namespace { const int kMaxHeight = 300; #if !defined(OS_MACOSX) -const int kMinHeight = 130; +const int kMinHeight = 80; #endif // !defined(OS_MACOSX) const int kWidth = 340; }