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..9b85aaa82922e624b65e7a3f717d33232b4240be 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,15 @@ 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/636338.
+  // Fix the underlying issue and remove the following code.
+  gfx::Size parent_content_size = parent()->GetContentsBounds().size();
+  SetSize(gfx::Size(parent_content_size.width(),

[sky, 2016/09/06 18:08:50]

It seems like you have an inherent preferred width based on the number of
columns/children? I'm suggesting the with should be a
std::max(parent_content_size.width(), GetPreferredSize().width())
I have GetPreferredSize().width(), but I suspect you could also calculate the
pref width in this function as well.

[qiangchen, 2016/09/06 18:38:10]

Done.

+                    std::max(parent_content_size.height(),
+                             y + active_style_->item_size.height())));
 }
 
 bool DesktopMediaListView::OnKeyPressed(const ui::KeyEvent& event) {