Bug Fix: Desktop Picker Window Shows Unnecessary Scrollbar

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 8b2a367de1e2e256e85bdd630f521386c055220e..5a5430c3f9157f37a2a62f3998c35ed576efc483 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
@@ -118,6 +118,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) {