GTK Themes: Theme the bookmark bubble. (And first run bubble).

chrome/browser/gtk/bookmark_bubble_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/bookmark_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/info_bubble_gtk.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // We basically have a singleton, since a bubble is sort of app-modal.  This
@@ skipping 76 matching lines @@
     remove_bookmark_ = newly_bookmarked_;
     apply_edits_ = false;
   }
 
   NotificationService::current()->Notify(
       NotificationType::BOOKMARK_BUBBLE_HIDDEN,
       Source<Profile>(profile_->GetOriginalProfile()),
       NotificationService::NoDetails());
 }
 
+void BookmarkBubbleGtk::Observe(NotificationType type,
+                                const NotificationSource& source,
+                                const NotificationDetails& details) {
+  DCHECK(type == NotificationType::BROWSER_THEME_CHANGED);
+
+  if (theme_provider_->UseGtkTheme()) {
+    for (std::vector<GtkWidget*>::iterator it = labels_.begin();
+         it != labels_.end(); ++it) {
+      gtk_widget_modify_fg(*it, GTK_STATE_NORMAL, NULL);
+    }
+  } else {
+    for (std::vector<GtkWidget*>::iterator it = labels_.begin();
+         it != labels_.end(); ++it) {
+      gtk_widget_modify_fg(*it, GTK_STATE_NORMAL, &gfx::kGdkBlack);
+    }
+  }
+}
+
 BookmarkBubbleGtk::BookmarkBubbleGtk(GtkWindow* transient_toplevel,
                                      const gfx::Rect& rect,
                                      Profile* profile,
                                      const GURL& url,
                                      bool newly_bookmarked)
     : url_(url),
       profile_(profile),
+      theme_provider_(GtkThemeProvider::GetFrom(profile_)),
       transient_toplevel_(transient_toplevel),
       content_(NULL),
       name_entry_(NULL),
       folder_combo_(NULL),
       bubble_(NULL),
       factory_(this),
       newly_bookmarked_(newly_bookmarked),
       apply_edits_(true),
       remove_bookmark_(false) {
   GtkWidget* label = gtk_label_new(l10n_util::GetStringUTF8(
       newly_bookmarked_ ? IDS_BOOMARK_BUBBLE_PAGE_BOOKMARKED :
                           IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK).c_str());
-  gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &gfx::kGdkBlack);
+  labels_.push_back(label);
   GtkWidget* remove_button = gtk_chrome_link_button_new(
       l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK).c_str());
   GtkWidget* edit_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_OPTIONS).c_str());
   GtkWidget* close_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_CLOSE).c_str());
 
   // Our content is arrange in 3 rows.  |top| contains a left justified
   // message, and a right justified remove link button.  |table| is the middle
   // portion with the name entry and the folder combo.  |bottom| is the final
@@ skipping 14 matching lines @@
   folder_nodes_ = PopulateFolderCombo(profile_->GetBookmarkModel(),
                                       url_, folder_combo_);
 
   // Create the edit entry for updating the bookmark name / title.
   name_entry_ = gtk_entry_new();
   gtk_entry_set_text(GTK_ENTRY(name_entry_), GetTitle().c_str());
 
   // We use a table to allow the labels to line up with each other, along
   // with the entry and folder combo lining up.
   GtkWidget* table = gtk_util::CreateLabeledControlsGroup(
-      &gfx::kGdkBlack,
+      &labels_,
       l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_TITLE_TEXT).c_str(),
       name_entry_,
       l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_FOLDER_TEXT).c_str(),
       folder_combo_,
       NULL);
 
   GtkWidget* bottom = gtk_hbox_new(FALSE, 0);
   // We want the buttons on the right, so just use an expanding label to fill
   // all of the extra space on the right.
   gtk_box_pack_start(GTK_BOX(bottom), gtk_label_new(""),
                      TRUE, TRUE, 0);
   gtk_box_pack_start(GTK_BOX(bottom), edit_button,
                      FALSE, FALSE, 4);
   gtk_box_pack_start(GTK_BOX(bottom), close_button,
                      FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(content), top, TRUE, TRUE, 0);
   gtk_box_pack_start(GTK_BOX(content), table, TRUE, TRUE, 0);
   gtk_box_pack_start(GTK_BOX(content), bottom, TRUE, TRUE, 0);
   // We want the focus to start on the entry, not on the remove button.
   gtk_container_set_focus_child(GTK_CONTAINER(content), table);
 
   bubble_ = InfoBubbleGtk::Show(transient_toplevel_,
-                                rect, content, this);
+                                rect, content, theme_provider_, this);
   if (!bubble_) {
     NOTREACHED();
     return;
   }
 
   g_signal_connect(content, "destroy",
                    G_CALLBACK(&HandleDestroyThunk), this);
   g_signal_connect(name_entry_, "activate",
                    G_CALLBACK(&HandleNameActivateThunk), this);
   g_signal_connect(folder_combo_, "changed",
                    G_CALLBACK(&HandleFolderChangedThunk), this);
   g_signal_connect(edit_button, "clicked",
                    G_CALLBACK(&HandleEditButtonThunk), this);
   g_signal_connect(close_button, "clicked",
                    G_CALLBACK(&HandleCloseButtonThunk), this);
   g_signal_connect(remove_button, "clicked",
                    G_CALLBACK(&HandleRemoveButtonThunk), this);
+
+  registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
+                 NotificationService::AllSources());
+  theme_provider_->InitThemesFor(this);
 }
 
 BookmarkBubbleGtk::~BookmarkBubbleGtk() {
   DCHECK(!content_);  // |content_| should have already been destroyed.
 
   DCHECK(g_bubble);
   g_bubble = NULL;
 
   if (apply_edits_) {
     ApplyEdits();
@@ skipping 101 matching lines @@
   GtkWidget* toplevel = GTK_WIDGET(transient_toplevel_);
 
   // Close the bubble, deleting the C++ objects, etc.
   bubble_->Close();
 
   if (node) {
     BookmarkEditor::Show(toplevel, profile, NULL, node,
                          BookmarkEditor::SHOW_TREE, NULL);
   }
 }