GTK Themes: Tint throbbers like we tint all other buttons in the interface.

chrome/browser/gtk/tabs/tab_renderer_gtk.cc

 // Copyright (c) 2009 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/gtk/tabs/tab_renderer_gtk.h"
 
 #include "app/gfx/canvas_paint.h"
 #include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gtk_util.h"
+#include "chrome/common/notification_service.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 
 namespace {
 
 const int kLeftPadding = 16;
 const int kTopPadding = 6;
 const int kRightPadding = 15;
@@ skipping 17 matching lines @@
 const SkScalar kTabTopCurveWidth = 4;
 const SkScalar kTabBottomCurveWidth = 3;
 
 // The vertical and horizontal offset used to position the close button
 // in the tab. TODO(jhawkins): Ask pkasting what the Fuzz is about.
 const int kCloseButtonVertFuzz = 0;
 const int kCloseButtonHorzFuzz = 5;
 
 SkBitmap* crashed_fav_icon = NULL;
 
-TabRendererGtk::LoadingAnimation::Data loading_animation_data;
+}  // namespace
 
-// Loads the loading animation images and data.
-void InitializeLoadingAnimationData(
-    ResourceBundle* rb, TabRendererGtk::LoadingAnimation::Data* data) {
+TabRendererGtk::LoadingAnimation::Data::Data(ThemeProvider* theme_provider) {
   // The loading animation image is a strip of states. Each state must be
   // square, so the height must divide the width evenly.
-  data->loading_animation_frames = rb->GetBitmapNamed(IDR_THROBBER);
-  DCHECK(data->loading_animation_frames);
-  DCHECK_EQ(data->loading_animation_frames->width() %
-            data->loading_animation_frames->height(), 0);
-  data->loading_animation_frame_count =
-      data->loading_animation_frames->width() /
-      data->loading_animation_frames->height();
+  loading_animation_frames = theme_provider->GetBitmapNamed(IDR_THROBBER);
+  DCHECK(loading_animation_frames);
+  DCHECK_EQ(loading_animation_frames->width() %
+            loading_animation_frames->height(), 0);
+  loading_animation_frame_count =
+      loading_animation_frames->width() /
+      loading_animation_frames->height();
 
-  data->waiting_animation_frames =
-      rb->GetBitmapNamed(IDR_THROBBER_WAITING);
-  DCHECK(data->waiting_animation_frames);
-  DCHECK_EQ(data->waiting_animation_frames->width() %
-            data->waiting_animation_frames->height(), 0);
-  data->waiting_animation_frame_count =
-      data->waiting_animation_frames->width() /
-      data->waiting_animation_frames->height();
+  waiting_animation_frames =
+      theme_provider->GetBitmapNamed(IDR_THROBBER_WAITING);
+  DCHECK(waiting_animation_frames);
+  DCHECK_EQ(waiting_animation_frames->width() %
+            waiting_animation_frames->height(), 0);
+  waiting_animation_frame_count =
+      waiting_animation_frames->width() /
+      waiting_animation_frames->height();
 
-  data->waiting_to_loading_frame_count_ratio =
-      data->waiting_animation_frame_count /
-      data->loading_animation_frame_count;
+  waiting_to_loading_frame_count_ratio =
+      waiting_animation_frame_count /
+      loading_animation_frame_count;
   // TODO(beng): eventually remove this when we have a proper themeing system.
   //             themes not supporting IDR_THROBBER_WAITING are causing this
   //             value to be 0 which causes DIV0 crashes. The value of 5
   //             matches the current bitmaps in our source.
-  if (data->waiting_to_loading_frame_count_ratio == 0)
-    data->waiting_to_loading_frame_count_ratio = 5;
+  if (waiting_to_loading_frame_count_ratio == 0)
+    waiting_to_loading_frame_count_ratio = 5;
 }
 
-}  // namespace
+TabRendererGtk::LoadingAnimation::Data::Data(
+    int loading, int waiting, int waiting_to_loading)
+    : waiting_animation_frames(NULL),
+      loading_animation_frames(NULL),
+      loading_animation_frame_count(loading),
+      waiting_animation_frame_count(waiting),
+      waiting_to_loading_frame_count_ratio(waiting_to_loading) {
+}
 
 bool TabRendererGtk::initialized_ = false;
 TabRendererGtk::TabImage TabRendererGtk::tab_active_ = {0};
 TabRendererGtk::TabImage TabRendererGtk::tab_inactive_ = {0};
 TabRendererGtk::TabImage TabRendererGtk::tab_alpha = {0};
 gfx::Font* TabRendererGtk::title_font_ = NULL;
 int TabRendererGtk::title_font_height_ = 0;
 int TabRendererGtk::close_button_width_ = 0;
 int TabRendererGtk::close_button_height_ = 0;
 SkColor TabRendererGtk::selected_title_color_ = SK_ColorBLACK;
 SkColor TabRendererGtk::unselected_title_color_ = SkColorSetRGB(64, 64, 64);
 int TabRendererGtk::pinned_tab_renderer_as_tab_width_ = 0;
 int TabRendererGtk::pinned_tab_pref_width_ = 0;
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRendererGtk::LoadingAnimation, public:
 //
-TabRendererGtk::LoadingAnimation::LoadingAnimation(const Data* data)
-    : data_(data), animation_state_(ANIMATION_NONE), animation_frame_(0) {
+TabRendererGtk::LoadingAnimation::LoadingAnimation(
+    ThemeProvider* theme_provider)
+    : data_(new Data(theme_provider)),
+      theme_provider_(theme_provider),
+      animation_state_(ANIMATION_NONE),
+      animation_frame_(0) {
+  registrar_.Add(this,
+                 NotificationType::BROWSER_THEME_CHANGED,
+                 NotificationService::AllSources());
+}
+
+TabRendererGtk::LoadingAnimation::LoadingAnimation(
+    const LoadingAnimation::Data& data)
+    : data_(new Data(data)),
+      theme_provider_(NULL),
+      animation_state_(ANIMATION_NONE),
+      animation_frame_(0) {
 }
 
 void TabRendererGtk::LoadingAnimation::ValidateLoadingAnimation(
     AnimationState animation_state) {
   if (animation_state_ != animation_state) {
     // The waiting animation is the reverse of the loading animation, but at a
     // different rate - the following reverses and scales the animation_frame_
     // so that the frame is at an equivalent position when going from one
     // animation to the other.
     if (animation_state_ == ANIMATION_WAITING &&
         animation_state == ANIMATION_LOADING) {
       animation_frame_ = data_->loading_animation_frame_count -
           (animation_frame_ / data_->waiting_to_loading_frame_count_ratio);
     }
     animation_state_ = animation_state;
   }
 
   if (animation_state_ != ANIMATION_NONE) {
     animation_frame_ = ++animation_frame_ %
                        ((animation_state_ == ANIMATION_WAITING) ?
                          data_->waiting_animation_frame_count :
                          data_->loading_animation_frame_count);
   } else {
     animation_frame_ = 0;
   }
 }
 
+void TabRendererGtk::LoadingAnimation::Observe(
+    NotificationType type,
+    const NotificationSource& source,
+    const NotificationDetails& details) {
+  DCHECK(type == NotificationType::BROWSER_THEME_CHANGED);
+  data_.reset(new Data(theme_provider_));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // FaviconCrashAnimation
 //
 //  A custom animation subclass to manage the favicon crash animation.
 class TabRendererGtk::FavIconCrashAnimation : public Animation,
                                               public AnimationDelegate {
  public:
   explicit FavIconCrashAnimation(TabRendererGtk* target)
       : ALLOW_THIS_IN_INITIALIZER_LIST(Animation(1000, 25, this)),
         target_(target) {
@@ skipping 22 matching lines @@
 
  private:
   TabRendererGtk* target_;
 
   DISALLOW_COPY_AND_ASSIGN(FavIconCrashAnimation);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabRendererGtk, public:
 
-TabRendererGtk::TabRendererGtk()
+TabRendererGtk::TabRendererGtk(ThemeProvider* theme_provider)
     : showing_icon_(false),
       showing_close_button_(false),
       fav_icon_hiding_offset_(0),
       should_display_crashed_favicon_(false),
-      loading_animation_(&loading_animation_data) {
+      loading_animation_(theme_provider) {
   InitResources();
 
   data_.pinned = false;
 
   tab_.Own(gtk_fixed_new());
   gtk_widget_set_app_paintable(tab_.get(), TRUE);
   g_signal_connect(G_OBJECT(tab_.get()), "expose-event",
                    G_CALLBACK(OnExpose), this);
   close_button_.reset(MakeCloseButton());
   gtk_widget_show(tab_.get());
@@ skipping 594 matching lines @@
     return;
 
   LoadTabImages();
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   // Force the font size to 10pt.
   gfx::Font base_font = rb.GetFont(ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(gfx::Font::CreateFont(base_font.FontName(), 10));
   title_font_height_ = title_font_->height();
 
-  InitializeLoadingAnimationData(&rb, &loading_animation_data);
-
   crashed_fav_icon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
   initialized_ = true;
 }