[Tab Groups] Make selection ring color match bubble background.

The inner ring is currently painted white which is not correct in dark
mode.

Bug: 1015634
Change-Id: Id028c5ed109b885ac20eeb4804bb493eae63567f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1961007
Commit-Queue: Charlene Yan <cyan@chromium.org>
Reviewed-by: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723569}

chrome/browser/ui/views/tabs/color_picker_view.cc

@@ -52,10 +52,12 @@ class ColorPickerElementView : public views::Button,
  public:
   ColorPickerElementView(
       base::RepeatingCallback<void(ColorPickerElementView*)> selected_callback,
+      SkColor background_color,
       SkColor color,
       base::string16 color_name)
       : Button(this),
         selected_callback_(std::move(selected_callback)),
+        background_color_(background_color),
         color_(color),
         color_name_(color_name) {
     DCHECK(selected_callback_);
@@ -155,12 +157,11 @@ class ColorPickerElementView : public views::Button,
     // Visual parameters of our ring.
     constexpr float kInset = 3.0f;
     constexpr float kThickness = 2.0f;
-    constexpr SkColor paint_color = SK_ColorWHITE;
     cc::PaintFlags flags;
     flags.setStyle(cc::PaintFlags::kStroke_Style);
     flags.setStrokeWidth(kThickness);
     flags.setAntiAlias(true);
-    flags.setColor(paint_color);
+    flags.setColor(background_color_);
 
     gfx::RectF indicator_bounds(GetContentsBounds());
     indicator_bounds.Inset(gfx::InsetsF(kInset));
@@ -169,14 +170,17 @@ class ColorPickerElementView : public views::Button,
                        indicator_bounds.width() / 2.0f, flags);
   }
 
-  base::RepeatingCallback<void(ColorPickerElementView*)> selected_callback_;
-  SkColor color_;
-  base::string16 color_name_;
+  const base::RepeatingCallback<void(ColorPickerElementView*)>
+      selected_callback_;
+  const SkColor background_color_;
+  const SkColor color_;
+  const base::string16 color_name_;
   bool selected_ = false;
 };
 
 ColorPickerView::ColorPickerView(
     base::span<const std::pair<SkColor, base::string16>> colors,
+    SkColor background_color,
     SkColor initial_color,
     ColorSelectedCallback callback)
     : callback_(std::move(callback)) {
@@ -187,7 +191,7 @@ ColorPickerView::ColorPickerView(
     // views in our destructor, ensuring we outlive them.
     elements_.push_back(AddChildView(std::make_unique<ColorPickerElementView>(
         base::Bind(&ColorPickerView::OnColorSelected, base::Unretained(this)),
-        color.first, color.second)));
+        background_color, color.first, color.second)));
     if (initial_color == color.first)
       elements_.back()->SetSelected(true);
   }

chrome/browser/ui/views/tabs/color_picker_view.h

@@ -31,6 +31,7 @@ class ColorPickerView : public views::View {
   // not be duplicate colors.
   explicit ColorPickerView(
       base::span<const std::pair<SkColor, base::string16>> colors,
+      SkColor background_color,
       SkColor initial_color,
       ColorSelectedCallback callback);
   ~ColorPickerView() override;

chrome/browser/ui/views/tabs/color_picker_view_unittest.cc

@@ -38,8 +38,9 @@ class ColorPickerViewTest : public ChromeViewsTestBase {
     widget_ = std::make_unique<views::Widget>();
     widget_->Init(std::move(widget_params));
 
-    color_picker_ = new ColorPickerView(kTestColors, SK_ColorCYAN,
-                                        color_selected_callback_.Get());
+    color_picker_ =
+        new ColorPickerView(kTestColors, SK_ColorWHITE, SK_ColorCYAN,
+                            color_selected_callback_.Get());
     widget_->SetContentsView(color_picker_);
 
     color_picker_->SizeToPreferredSize();
@@ -102,8 +103,9 @@ TEST_F(ColorPickerViewTest, ColorSelectedByDefaultIfMatching) {
   std::unique_ptr<views::Widget> widget = std::make_unique<views::Widget>();
   widget->Init(std::move(widget_params));
 
-  ColorPickerView* color_picker = new ColorPickerView(
-      kTestColors, initial_color, color_selected_callback_.Get());
+  ColorPickerView* color_picker =
+      new ColorPickerView(kTestColors, SK_ColorWHITE, initial_color,
+                          color_selected_callback_.Get());
   widget->SetContentsView(color_picker);
 
   color_picker->SizeToPreferredSize();

chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc

@@ -127,7 +127,7 @@ TabGroupEditorBubbleView::TabGroupEditorBubbleView(
 
   color_selector_ =
       group_modifier_container->AddChildView(std::make_unique<ColorPickerView>(
-          GetColorPickerList(), current_data->color(),
+          GetColorPickerList(), background_color(), current_data->color(),
           base::Bind(&TabGroupEditorBubbleView::UpdateGroup,
                      base::Unretained(this))));
   color_selector_->SetBorder(views::CreateEmptyBorder(

chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.h

@@ -43,6 +43,8 @@ class TabGroupEditorBubbleView : public views::BubbleDialogDelegateView {
 
   void UpdateGroup();
 
+  SkColor background_color() const { return color(); }
+
   TabController* const tab_controller_;
   const TabGroupId group_;