Adding a ScrollView for IntentPickerBubbleView

chrome/browser/ui/views/intent_picker_bubble_view.cc

Index: chrome/browser/ui/views/intent_picker_bubble_view.cc
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view.cc b/chrome/browser/ui/views/intent_picker_bubble_view.cc
index c5f007a5ca7746472d5fe094fadf0bfffa071754..fcabd20724506c1cad2c11307c25072860f95351 100644
--- a/chrome/browser/ui/views/intent_picker_bubble_view.cc
+++ b/chrome/browser/ui/views/intent_picker_bubble_view.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/ui/views/intent_picker_bubble_view.h"
 
-#include <algorithm>
-
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
@@ -18,16 +16,22 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
+#include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/scroll_view.h"
+#include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/window/dialog_client_view.h"
 
+namespace content {
+class WebContents;
+}  // namespace content
+
 namespace {
 
-// TODO(djacobo): Add a scroll bar and remove kMaxAppResults.
-// Discriminating app results when the list is longer than |kMaxAppResults|
-constexpr size_t kMaxAppResults = 3;
+// Using |kMaxAppResults| as a measure of how many apps we want to show.
+constexpr size_t kMaxAppResults = arc::ArcNavigationThrottle::kMaxAppResults;
 // Main components sizes
 constexpr int kRowHeight = 40;
 constexpr int kMaxWidth = 320;
@@ -39,7 +43,7 @@ constexpr int kLabelImageSeparation = 12;
 
 // UI position wrt the Top Container
 constexpr int kTopContainerMerge = 3;
-constexpr int kAppTagNoneSelected = -1;
+constexpr size_t kAppTagNoneSelected = -1;

[Luis Héctor Chávez, 2016/07/20 22:16:38]

size_t is unsigned. Maybe ssize_t?

[djacobo_, 2016/07/21 16:04:11]

This variable is used together with the enum CloseReason; CloseReason let the
caller know about the status when the UI finish his execution, so this value is
rather a dummy, let me know what you think.

 
 // Arbitrary negative values to use as tags on the |always_button_| and
 // |just_once_button_|. These are negative to differentiate from the app's tags
@@ -89,6 +93,18 @@ void IntentPickerBubbleView::ShowBubble(
   widget->Show();
 }
 
+// static
+std::unique_ptr<IntentPickerBubbleView>
+IntentPickerBubbleView::CreateBubbleForTesting(
+    const std::vector<NameAndIcon>& app_info,
+    const ThrottleCallback& throttle_cb,
+    content::WebContents* web_contents) {
+  std::unique_ptr<IntentPickerBubbleView> bubble(
+      new IntentPickerBubbleView(app_info, throttle_cb, web_contents));

[Yusuke Sato, 2016/07/20 21:58:57]

auto bubble = base::MakeUnique<...>(...); ?

It's in base/memory/ptr_util.h.

[djacobo_, 2016/07/21 16:04:11]

by using base::MakeUnique<...>(...); que compiler ask me to make the constructor
public, I would rather not to, what do you think?

[Luis Héctor Chávez, 2016/07/21 21:55:34]

Another option is to make base::MakeUnique<IntentPickerBubbleView> a friend, but
you're probably right in that this is maybe not worth it.

+  bubble->Init();
+  return bubble;
+}
+
 void IntentPickerBubbleView::Init() {
   SkColor button_text_color = SkColorSetRGB(0x42, 0x85, 0xf4);
 
@@ -128,6 +144,8 @@ void IntentPickerBubbleView::Init() {
   always_button_->SetTextColor(views::Button::STATE_HOVERED, button_text_color);
   always_button_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
   always_button_->SetState(views::Button::STATE_DISABLED);
+  // Insets in the format top, left, bottom, right.
+  always_button_->SetBorder(views::Border::CreateEmptyBorder(16, 16, 16, 16));
 
   just_once_button_ = new views::LabelButton(
       this, l10n_util::GetStringUTF16(IDS_INTENT_PICKER_BUBBLE_VIEW_JUST_ONCE));
@@ -142,8 +160,19 @@ void IntentPickerBubbleView::Init() {
   just_once_button_->SetTextColor(views::Button::STATE_HOVERED,
                                   button_text_color);
   just_once_button_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
+  just_once_button_->SetBorder(
+      views::Border::CreateEmptyBorder(16, 16, 16, 16));
+
+  // Adding the |open_with| label to the picker.
+  header_layout->StartRow(0, 0);
+  AddChildView(header);
 
-  for (size_t i = 0; i < std::min(app_info_.size(), kMaxAppResults); ++i) {
+  // Setting a view and a layout for a ScrollView for the apps' list.
+  views::View* scrollable_view = new views::View();
+  views::BoxLayout* scrollable_layout =
+      new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0);
+  scrollable_view->SetLayoutManager(scrollable_layout);
+  for (size_t i = 0; i < app_info_.size(); ++i) {
     views::LabelButton* tmp_label = new views::LabelButton(
         this, base::UTF8ToUTF16(base::StringPiece(app_info_[i].first)));
     tmp_label->SetFocusBehavior(View::FocusBehavior::ALWAYS);
@@ -152,23 +181,37 @@ void IntentPickerBubbleView::Init() {
     tmp_label->SetMinSize(gfx::Size(kMaxWidth, kRowHeight));
     tmp_label->SetMaxSize(gfx::Size(kMaxWidth, kRowHeight));
     tmp_label->set_tag(i);
-    const gfx::ImageSkia* icon_ = app_info_[i].second.ToImageSkia();
-    tmp_label->SetImage(views::ImageButton::STATE_NORMAL, *icon_);
-    header_layout->StartRow(0, 0);
-    header_layout->AddView(tmp_label);
+    // By default a View set the id = 0 so we need to set values within the
+    // range [1, app_info_.size()].
+    tmp_label->set_id(i + 1);

[Yusuke Sato, 2016/07/20 21:58:57]

These IDs conflict with the ones in chrome/browser/ui/view_ids.h? I'm not sure
if this is okay. Please check what other code does.

[djacobo_, 2016/07/21 16:04:11]

On the most parts of the codebase that I watched the use is only for well known
IDs like the ones you mention (on views_ids.h), I made some modifications to use
child_at() instead, it's a bit messy but I separated that on a pair of functions
(take a look at ButtonPressed(). Done

+    if (!app_info_[i].second.IsEmpty()) {
+      tmp_label->SetImage(views::ImageButton::STATE_NORMAL,
+                          *app_info_[i].second.ToImageSkia());
+    }
+    tmp_label->SetBorder(views::Border::CreateEmptyBorder(10, 16, 10, 0));
+    scrollable_view->AddChildView(tmp_label);
   }
 
-  // Adding the Upper part of the Intent Picker |open_with| label and all the
-  // app options to |this|.
-  header_layout->StartRow(0, 0);
-  header_layout->AddPaddingRow(0, 12);
-  AddChildView(header);
+  views::ScrollView* scroll_view = new views::ScrollView();
+  scroll_view->SetContents(scrollable_view);
+  scroll_view->SetVerticalScrollBar(new views::OverlayScrollBar(false));
+  // This part gives the scroll a fixed width and height. The height depends on
+  // how many app candidates we got and how many we actually want to show.
+  // The added 0.5 on the else block allow us to let the user know there are
+  // more than |kMaxAppResults| apps accessible by scrolling the list.
+  if (app_info_.size() <= kMaxAppResults) {
+    scroll_view->ClipHeightTo(kMaxWidth, app_info_.size() * kRowHeight);
+  } else {
+    scroll_view->ClipHeightTo(kMaxWidth, (kMaxAppResults + 0.5) * kRowHeight);
+  }
+  AddChildView(scroll_view);
 
   // The lower part of the Picker contains only the 2 buttons
   // |just_once_button_| and |always_button_|.
   View* footer = new View();
+  footer->SetBorder(views::Border::CreateEmptyBorder(24, 0, 12, 12));
   views::BoxLayout* buttons_layout = new views::BoxLayout(
-      views::BoxLayout::kHorizontal, 12, 12, kButtonSeparation);
+      views::BoxLayout::kHorizontal, 0, 0, kButtonSeparation);
   footer->SetLayoutManager(buttons_layout);
 
   buttons_layout->set_main_axis_alignment(
@@ -196,6 +239,10 @@ IntentPickerBubbleView::~IntentPickerBubbleView() {
   SetLayoutManager(nullptr);
 }
 
+size_t IntentPickerBubbleView::GetNumberOfAppLabelsForTesting() {
+  return app_info_.size();
+}
+
 // If the widget gets closed without an app being selected we still need to use
 // the callback so the caller can Resume the navigation.
 void IntentPickerBubbleView::OnWidgetDestroying(views::Widget* widget) {
@@ -215,24 +262,36 @@ void IntentPickerBubbleView::ButtonPressed(views::Button* sender,
                                            const ui::Event& event) {
   switch (sender->tag()) {
     case static_cast<int>(Option::ALWAYS):
-      throttle_cb_.Run(selected_app_tag_,
-                       arc::ArcNavigationThrottle::CloseReason::ALWAYS_PRESSED);
-      was_callback_run_ = true;
+      if (!was_callback_run_) {
+        throttle_cb_.Run(
+            selected_app_tag_,
+            arc::ArcNavigationThrottle::CloseReason::ALWAYS_PRESSED);
+        was_callback_run_ = true;
+      }
       GetWidget()->Close();
       break;
     case static_cast<int>(Option::JUST_ONCE):
-      throttle_cb_.Run(
-          selected_app_tag_,
-          arc::ArcNavigationThrottle::CloseReason::JUST_ONCE_PRESSED);
-      was_callback_run_ = true;
+      if (!was_callback_run_) {
+        throttle_cb_.Run(
+            selected_app_tag_,
+            arc::ArcNavigationThrottle::CloseReason::JUST_ONCE_PRESSED);
+        was_callback_run_ = true;
+      }
       GetWidget()->Close();
       break;
     default:
-      // TODO(djacobo): Paint the background of the selected button on a
-      // different color, so the user has a clear remainder of his selection.
       // The user cannot click on the |always_button_| or |just_once_button_|
       // unless an explicit app has been selected.
+      if (selected_app_tag_ != kAppTagNoneSelected) {
+        GetViewByID(selected_app_tag_ + 1)
+            ->set_background(
+                views::Background::CreateSolidBackground(SK_ColorWHITE));
+        GetViewByID(selected_app_tag_ + 1)->SchedulePaint();
+      }
       selected_app_tag_ = sender->tag();
+      GetViewByID(selected_app_tag_ + 1)
+          ->set_background(views::Background::CreateSolidBackground(
+              SkColorSetRGB(0xeb, 0xeb, 0xeb)));
       always_button_->SetState(views::Button::STATE_NORMAL);
       just_once_button_->SetState(views::Button::STATE_NORMAL);
   }
@@ -241,8 +300,15 @@ void IntentPickerBubbleView::ButtonPressed(views::Button* sender,
 gfx::Size IntentPickerBubbleView::GetPreferredSize() const {
   gfx::Size ps;
   ps.set_width(kMaxWidth);
-  ps.set_height((std::min(app_info_.size(), kMaxAppResults)) * kRowHeight +
-                kHeaderHeight + kFooterHeight);
+  int apps_height = app_info_.size();
+  // We are showing |kMaxAppResults| + 0.5 rows at max, the extra 0.5 is used so
+  // the user can notice that more options are available.
+  if (app_info_.size() > kMaxAppResults) {
+    apps_height = (kMaxAppResults + 0.5) * kRowHeight;
+  } else {
+    apps_height *= kRowHeight;
+  }
+  ps.set_height(apps_height + kHeaderHeight + kFooterHeight);
   return ps;
 }