Bug Fix: Desktop Picker Window Shows Unnecessary Scrollbar [M54]

chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc

Index: chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc
index ef1b7644b09028168643bc7f842db7ecd5d84138..045d39423db4f3c470d801e43e58a24e610faa14 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_list_view.cc
@@ -89,6 +89,14 @@ void DesktopMediaListView::Layout() {
 
     x += active_style_->item_size.width();
   }
+
+  // TODO(qiangchen): Bounded ScrollView has a bug to display horizontal bar
+  // always, and then display vertical bar when the content just fit the
+  // container. See crbug/644463.
+  // Fix the underlying issue and remove the following code.
+  gfx::Size preferred_size = GetPreferredSize();
+  preferred_size.SetToMax(parent()->GetContentsBounds().size());
+  SetSize(preferred_size);
 }
 
 bool DesktopMediaListView::OnKeyPressed(const ui::KeyEvent& event) {