Fix status bar color not updating when applying a theme on Linux.

chrome/browser/ui/views/status_bubble_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/status_bubble_views.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
@@ skipping 118 matching lines @@
   };
 
   enum BubbleStyle {
     STYLE_BOTTOM,
     STYLE_FLOATING,
     STYLE_STANDARD,
     STYLE_STANDARD_RIGHT
   };
 
   StatusView(views::Widget* popup,
-             const gfx::Size& popup_size_,
-             SkColor bubble_color,
-             SkColor bubble_text_color,
+             const gfx::Size& popup_size,
+             const ui::ThemeProvider* theme_provider,
              bool has_client_edge);
   ~StatusView() override;
 
   // Set the bubble text to a certain value, hides the bubble if text is
   // an empty string.  Trigger animation sequence to display if
   // |should_animate_open|.
   void SetText(const base::string16& text, bool should_animate_open);
 
   BubbleState state() const { return state_; }
   BubbleStyle style() const { return style_; }
@@ skipping 42 matching lines @@
   std::unique_ptr<StatusViewAnimation> animation_;
 
   // Handle to the widget that contains us.
   views::Widget* popup_;
 
   // The currently-displayed text.
   base::string16 text_;
 
   gfx::Size popup_size_;
 
-  const SkColor bubble_color_;
-  const SkColor bubble_text_color_;
+  const ui::ThemeProvider* theme_provider_;
   const bool has_client_edge_;
 
   base::WeakPtrFactory<StatusBubbleViews::StatusView> timer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusView);
 };
 
-StatusBubbleViews::StatusView::StatusView(views::Widget* popup,
-                                          const gfx::Size& popup_size,
-                                          SkColor bubble_color,
-                                          SkColor bubble_text_color,
-                                          bool has_client_edge)
+StatusBubbleViews::StatusView::StatusView(
+    views::Widget* popup,
+    const gfx::Size& popup_size,
+    const ui::ThemeProvider* theme_provider,

[Peter Kasting, 2016/09/24 06:07:40]

So I know we're on the same page, the other solutions would be:

* Recreate the status bubble on theme change
* Have the status bubble listen for theme changes and update its colors
* Have something else listen for theme changes and tell the status bubble to
update its colors

Probably the second of these is the best of the three, since it seems simpler
than the third, and the first is about the same amount of effort as the third. 
But we'd only really do the second over this solution if getting the colors were
expensive, and it's not.  So this solution seems good.

It sounds like some platforms _do_ recreate the status bubble on theme changes? 
Do they really need to?  Maybe we can nuke that?

[Bret, 2016/09/24 19:28:36]

Windows does nuke the class when the theme changes (even if it was already using
opaque frame) which is why I didn't catch it before. It doesn't seem like it
needs to, but it might be unavoidable for some reason. I haven't investigated
it.

No idea for other platforms. Since the bug I got was only for Linux I assume
that's the odd one out.

+    bool has_client_edge)
     : state_(BUBBLE_HIDDEN),
       style_(STYLE_STANDARD),
       animation_(new StatusViewAnimation(this, 0, 0)),
       popup_(popup),
       popup_size_(popup_size),
-      bubble_color_(bubble_color),
-      bubble_text_color_(bubble_text_color),
+      theme_provider_(theme_provider),
       has_client_edge_(has_client_edge),
       timer_factory_(this) {}
 
 StatusBubbleViews::StatusView::~StatusView() {
   animation_->Stop();
   CancelTimer();
 }
 
 void StatusBubbleViews::StatusView::SetText(const base::string16& text,
                                             bool should_animate_open) {
@@ skipping 228 matching lines @@
   paint.setStrokeWidth(1);
   paint.setAntiAlias(true);
 
   SkPath stroke_path;
   paint.getFillPath(path, &stroke_path);
 
   // Get the fill path by subtracting the shadow so they align neatly.
   SkPath fill_path;
   Op(path, stroke_path, kDifference_SkPathOp, &fill_path);
   paint.setStyle(SkPaint::kFill_Style);
-  paint.setColor(bubble_color_);
+  const SkColor bubble_color =
+      theme_provider_->GetColor(ThemeProperties::COLOR_TOOLBAR);
+  paint.setColor(bubble_color);
   canvas->sk_canvas()->drawPath(fill_path, paint);
 
   paint.setColor(kShadowColor);
   canvas->sk_canvas()->drawPath(stroke_path, paint);
 
   canvas->Restore();
 
   // Compute text bounds.
   gfx::Rect text_rect(kTextPositionX, 0,
                       popup_size_.width() - kTextHorizPadding,
                       popup_size_.height());
   text_rect.Inset(kShadowThickness, kShadowThickness);
   // Make sure the text is aligned to the right on RTL UIs.
   text_rect.set_x(GetMirroredXForRect(text_rect));
 
   // Text color is the foreground tab text color at 60% alpha.
-  SkColor blended_text_color =
-      color_utils::AlphaBlend(bubble_text_color_, bubble_color_, 0x99);
+  SkColor blended_text_color = color_utils::AlphaBlend(
+      theme_provider_->GetColor(ThemeProperties::COLOR_TAB_TEXT), bubble_color,
+      0x99);
   canvas->DrawStringRect(
       text_, gfx::FontList(),
-      color_utils::GetReadableColor(blended_text_color, bubble_color_),
+      color_utils::GetReadableColor(blended_text_color, bubble_color),
       text_rect);
 }
 
 
 // StatusBubbleViews::StatusViewAnimation --------------------------------------
 
 StatusBubbleViews::StatusViewAnimation::StatusViewAnimation(
     StatusView* status_view,
     float opacity_start,
     float opacity_end)
@@ skipping 122 matching lines @@
   CancelExpandTimer();
   if (popup_.get())
     popup_->CloseNow();
 }
 
 void StatusBubbleViews::Init() {
   if (!popup_.get()) {
     popup_.reset(new views::Widget);
     views::Widget* frame = base_view_->GetWidget();
     if (!view_) {
-      const ui::ThemeProvider* theme_provider = frame->GetThemeProvider();
-      view_ = new StatusView(
-          popup_.get(), size_,
-          theme_provider->GetColor(ThemeProperties::COLOR_TOOLBAR),
-          theme_provider->GetColor(ThemeProperties::COLOR_TAB_TEXT),
-          has_client_edge_);
+      view_ = new StatusView(popup_.get(), size_, frame->GetThemeProvider(),
+                             has_client_edge_);
     }
     if (!expand_view_.get())
       expand_view_.reset(new StatusViewExpander(this, view_));
 
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
 #if defined(OS_WIN)
     // On Windows use the software compositor to ensure that we don't block
     // the UI thread blocking issue during command buffer creation. We can
     // revert this change once http://crbug.com/125248 is fixed.
     params.force_software_compositing = true;
@@ skipping 295 matching lines @@
 void StatusBubbleViews::SetBubbleWidth(int width) {
   size_.set_width(width);
   SetBounds(original_position_.x(), original_position_.y(),
             size_.width(), size_.height());
 }
 
 void StatusBubbleViews::CancelExpandTimer() {
   if (expand_timer_factory_.HasWeakPtrs())
     expand_timer_factory_.InvalidateWeakPtrs();
 }