GTK: Popup notification is readable with dark themes in chrome theme mode.

chrome/browser/gtk/blocked_popup_container_view_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/blocked_popup_container_view_gtk.h"
 
 #include "app/l10n_util.h"
 #include "base/gfx/gtk_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
 #include "chrome/common/gtk_util.h"
+#include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 namespace {
 // The minimal border around the edge of the notification.
 const int kSmallPadding = 2;
 
 // Size of the border painted in kBorderColor
 const int kBorderPadding = 1;
 
@@ skipping 40 matching lines @@
 }
 
 void BlockedPopupContainerViewGtk::ShowView() {
   // TODO(erg): Animate in.
   gtk_widget_show_all(container_.get());
 }
 
 void BlockedPopupContainerViewGtk::UpdateLabel() {
   size_t blocked_popups = model_->GetBlockedPopupCount();
 
-  gtk_button_set_label(
-      GTK_BUTTON(menu_button_),
+  GtkWidget* label = gtk_bin_get_child(GTK_BIN(menu_button_));
+  if (!label) {
+    label = gtk_label_new("");
+    gtk_container_add(GTK_CONTAINER(menu_button_), label);
+  }
+
+  gtk_label_set_text(
+      GTK_LABEL(label),
       (blocked_popups > 0) ?
       l10n_util::GetStringFUTF8(IDS_POPUPS_BLOCKED_COUNT,
                                 UintToString16(blocked_popups)).c_str() :
       l10n_util::GetStringUTF8(IDS_POPUPS_UNBLOCKED).c_str());
 }
 
 void BlockedPopupContainerViewGtk::HideView() {
   // TODO(erg): Animate out.
   gtk_widget_hide(container_.get());
 }
 
 void BlockedPopupContainerViewGtk::Destroy() {
   ContainingView()->RemoveBlockedPopupView(this);
   delete this;
 }
 
+void BlockedPopupContainerViewGtk::Observe(NotificationType type,
+                                           const NotificationSource& source,
+                                           const NotificationDetails& details) {
+  if (type == NotificationType::BROWSER_THEME_CHANGED) {

[Evan Stade, 2009/07/21 20:00:41]

in the interest of keeping things as little indented as possible I think I'd
just make this a DCHECK

+    // Make sure the label exists (so we can change its colors).
+    UpdateLabel();
+
+    // Update the label's colors.
+    GtkWidget* label = gtk_bin_get_child(GTK_BIN(menu_button_));
+    if (theme_provider_->UseGtkTheme()) {
+      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, NULL);
+      gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, NULL);
+      gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, NULL);
+      gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, NULL);
+    } else {
+      GdkColor color = theme_provider_->GetGdkColor(
+          BrowserThemeProvider::COLOR_BOOKMARK_TEXT);
+      gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &color);
+      gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &color);
+      gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &color);
+      gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &color);
+    }
+  } else {
+    NOTREACHED();
+  }
+}
+
 bool BlockedPopupContainerViewGtk::IsCommandEnabled(int command_id) const {
   return true;
 }
 
 bool BlockedPopupContainerViewGtk::IsItemChecked(int id) const {
   DCHECK_GT(id, 0);
   size_t id_size_t = static_cast<size_t>(id);
   if (id_size_t > BlockedPopupContainer::kImpossibleNumberOfPopups) {
     return model_->IsHostWhitelisted(
         id_size_t - BlockedPopupContainer::kImpossibleNumberOfPopups - 1);
@@ skipping 14 matching lines @@
     model_->LaunchPopupAtIndex(id_size_t - 1);
   }
 }
 
 BlockedPopupContainerViewGtk::BlockedPopupContainerViewGtk(
     BlockedPopupContainer* container)
     : model_(container),
       theme_provider_(GtkThemeProvider::GetFrom(container->profile())),
       close_button_(CustomDrawButton::CloseButton()) {
   Init();
+
+  registrar_.Add(this,
+                 NotificationType::BROWSER_THEME_CHANGED,
+                 NotificationService::AllSources());
+  theme_provider_->InitThemesFor(this);
 }
 
 void BlockedPopupContainerViewGtk::Init() {
   menu_button_ = theme_provider_->BuildChromeButton();
   UpdateLabel();
   g_signal_connect(menu_button_, "clicked",
                    G_CALLBACK(OnMenuButtonClicked), this);
 
   GtkWidget* hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(hbox), menu_button_, FALSE, FALSE, kSmallPadding);
@@ skipping 97 matching lines @@
   cairo_line_to(cr, width - kBackgroundCornerRadius, 0);
   cairo_curve_to(cr, width - kBackgroundCornerRadius, 0,
                  width, 0, width, kBackgroundCornerRadius);
   cairo_line_to(cr, width, height);
   cairo_stroke(cr);
 
   cairo_destroy(cr);
 
   return FALSE;  // Allow subwidgets to paint.
 }