[gtk] fix theming of content settings bubble

chrome/browser/ui/gtk/content_setting_bubble_gtk.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/gtk/content_setting_bubble_gtk.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 82 matching lines @@
 void ContentSettingBubbleGtk::BuildBubble() {
   GtkThemeService* theme_provider = GtkThemeService::GetFrom(profile_);
 
   GtkWidget* bubble_content = gtk_vbox_new(FALSE, ui::kControlSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(bubble_content), kContentBorder);
 
   const ContentSettingBubbleModel::BubbleContent& content =
       content_setting_bubble_model_->bubble_content();
   if (!content.title.empty()) {
     // Add the content label.
-    GtkWidget* label = gtk_label_new(content.title.c_str());
+    GtkWidget* label = theme_provider->BuildLabel(content.title.c_str(),
+                                                  ui::kGdkBlack);
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
     gtk_box_pack_start(GTK_BOX(bubble_content), label, FALSE, FALSE, 0);
   }
 
   const std::set<std::string>& plugins = content.resource_identifiers;
   if (!plugins.empty()) {
     GtkWidget* list_content = gtk_vbox_new(FALSE, ui::kControlSpacing);
 
     for (std::set<std::string>::const_iterator it = plugins.begin();
         it != plugins.end(); ++it) {
       std::string name = UTF16ToUTF8(
           PluginService::GetInstance()->GetPluginGroupName(*it));
       if (name.empty())
         name = *it;
 
-      GtkWidget* label = gtk_label_new(BuildElidedText(name).c_str());
+      GtkWidget* label = theme_provider->BuildLabel(
+          BuildElidedText(name).c_str(), ui::kGdkBlack);
       GtkWidget* label_box = gtk_hbox_new(FALSE, 0);
       gtk_box_pack_start(GTK_BOX(label_box), label, FALSE, FALSE, 0);
 
       gtk_box_pack_start(GTK_BOX(list_content),
                          label_box,
                          FALSE, FALSE, 0);
     }
     gtk_box_pack_start(GTK_BOX(bubble_content), list_content, FALSE, FALSE,
                        ui::kControlSpacing);
   }
@@ skipping 39 matching lines @@
   }
 
   const ContentSettingBubbleModel::RadioGroup& radio_group =
       content.radio_group;
   for (ContentSettingBubbleModel::RadioItems::const_iterator i =
        radio_group.radio_items.begin();
        i != radio_group.radio_items.end(); ++i) {
     std::string elided = BuildElidedText(*i);
     GtkWidget* radio =
         radio_group_gtk_.empty() ?
-            gtk_radio_button_new_with_label(NULL, elided.c_str()) :
-            gtk_radio_button_new_with_label_from_widget(
-                GTK_RADIO_BUTTON(radio_group_gtk_[0]),
-                elided.c_str());
+            gtk_radio_button_new(NULL) :
+            gtk_radio_button_new_from_widget(
+                GTK_RADIO_BUTTON(radio_group_gtk_[0]));
+    GtkWidget* label =
+        theme_provider->BuildLabel(elided.c_str(), ui::kGdkBlack);
+    gtk_container_add(GTK_CONTAINER(radio), label);
     gtk_box_pack_start(GTK_BOX(bubble_content), radio, FALSE, FALSE, 0);
     if (i - radio_group.radio_items.begin() == radio_group.default_item) {
       // We must set the default value before we attach the signal handlers
       // or pain occurs.
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), TRUE);
     }
     if (!content.radio_group_enabled)
       gtk_widget_set_sensitive(radio, FALSE);
     radio_group_gtk_.push_back(radio);
   }
   for (std::vector<GtkWidget*>::const_iterator i = radio_group_gtk_.begin();
        i != radio_group_gtk_.end(); ++i) {
     // We can attach signal handlers now that all defaults are set.
     g_signal_connect(*i, "toggled", G_CALLBACK(OnRadioToggledThunk), this);
   }
 
   for (std::vector<ContentSettingBubbleModel::DomainList>::const_iterator i =
        content.domain_lists.begin();
        i != content.domain_lists.end(); ++i) {
     // Put each list into its own vbox to allow spacing between lists.
     GtkWidget* list_content = gtk_vbox_new(FALSE, ui::kControlSpacing);
 
-    GtkWidget* label = gtk_label_new(BuildElidedText(i->title).c_str());
+    GtkWidget* label = theme_provider->BuildLabel(
+        BuildElidedText(i->title).c_str(), ui::kGdkBlack);
     gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
     GtkWidget* label_box = gtk_hbox_new(FALSE, 0);
     gtk_box_pack_start(GTK_BOX(label_box), label, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(list_content), label_box, FALSE, FALSE, 0);
     for (std::set<std::string>::const_iterator j = i->hosts.begin();
          j != i->hosts.end(); ++j) {
       gtk_box_pack_start(GTK_BOX(list_content),
                          gtk_util::IndentWidget(gtk_util::CreateBoldLabel(*j)),
                          FALSE, FALSE, 0);
     }
     gtk_box_pack_start(GTK_BOX(bubble_content), list_content, FALSE, FALSE,
                        ui::kControlSpacing);
   }
 
   if (!content.custom_link.empty()) {
     GtkWidget* custom_link_box = gtk_hbox_new(FALSE, 0);
     GtkWidget* custom_link = NULL;
     if (content.custom_link_enabled) {
-      custom_link = gtk_chrome_link_button_new(content.custom_link.c_str());
+      custom_link =
+          theme_provider->BuildChromeLinkButton(content.custom_link.c_str());
       g_signal_connect(custom_link, "clicked",
                        G_CALLBACK(OnCustomLinkClickedThunk), this);
     } else {
-      custom_link = gtk_label_new(content.custom_link.c_str());
+      custom_link = theme_provider->BuildLabel(content.custom_link.c_str(),
+                                               ui::kGdkBlack);
       gtk_misc_set_alignment(GTK_MISC(custom_link), 0, 0.5);
     }
     DCHECK(custom_link);
     gtk_box_pack_start(GTK_BOX(custom_link_box), custom_link, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(bubble_content), custom_link_box,
                        FALSE, FALSE, 0);
   }
 
   gtk_box_pack_start(GTK_BOX(bubble_content), gtk_hseparator_new(),
                      FALSE, FALSE, 0);
 
   GtkWidget* bottom_box = gtk_hbox_new(FALSE, 0);
 
   GtkWidget* manage_link =
-      gtk_chrome_link_button_new(content.manage_link.c_str());
+      theme_provider->BuildChromeLinkButton(content.manage_link.c_str());
   g_signal_connect(manage_link, "clicked", G_CALLBACK(OnManageLinkClickedThunk),
                    this);
   gtk_box_pack_start(GTK_BOX(bottom_box), manage_link, FALSE, FALSE, 0);
 
   GtkWidget* button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_DONE).c_str());
   g_signal_connect(button, "clicked", G_CALLBACK(OnCloseButtonClickedThunk),
                    this);
   gtk_box_pack_end(GTK_BOX(bottom_box), button, FALSE, FALSE, 0);
 
@@ skipping 56 matching lines @@
 
 void ContentSettingBubbleGtk::OnCustomLinkClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnCustomLinkClicked();
   Close();
 }
 
 void ContentSettingBubbleGtk::OnManageLinkClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnManageLinkClicked();
   Close();
 }