Update Content Settings Bubbles

chrome/browser/gtk/content_setting_bubble_gtk.cc

 // Copyright (c) 2010 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/content_setting_bubble_gtk.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 174 matching lines @@
         // or pain occurs.
         gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), TRUE);
       }
       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);
     }
-    if (!radio_group_gtk_.empty()) {
-      gtk_box_pack_start(GTK_BOX(bubble_content), gtk_hseparator_new(), FALSE,
-                         FALSE, 0);
-    }
   }
 
   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, gtk_util::kControlSpacing);
 
     GtkWidget* label = gtk_label_new(BuildElidedText(i->title).c_str());
     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,
                        gtk_util::kControlSpacing);
   }
 
-  if (!content.clear_link.empty()) {
-    GtkWidget* clear_link_box = gtk_hbox_new(FALSE, 0);
-    GtkWidget* clear_link = gtk_chrome_link_button_new(
-        content.clear_link.c_str());
-    g_signal_connect(clear_link, "clicked", G_CALLBACK(OnClearLinkClickedThunk),
-                     this);
-    gtk_box_pack_start(GTK_BOX(clear_link_box), clear_link, FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(bubble_content), clear_link_box,
-                       FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(bubble_content), gtk_hseparator_new(),
+  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());
+      g_signal_connect(custom_link, "clicked",
+                       G_CALLBACK(OnCustomLinkClickedThunk), this);
+    } else {
+      custom_link = gtk_label_new(content.custom_link.c_str());
+      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);
   }
 
-  if (!content.info_link.empty()) {
-    GtkWidget* info_link_box = gtk_hbox_new(FALSE, 0);
-    GtkWidget* info_link = gtk_chrome_link_button_new(
-        content.info_link.c_str());
-    g_signal_connect(info_link, "clicked", G_CALLBACK(OnInfoLinkClickedThunk),
-                     this);
-    gtk_box_pack_start(GTK_BOX(info_link_box), info_link, FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(bubble_content), info_link_box,
-                       FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(bubble_content), gtk_hseparator_new(),
-                       FALSE, FALSE, 0);
-  }
-
-  if (!content.load_plugins_link_title.empty()) {
-    GtkWidget* load_plugins_link_box = gtk_hbox_new(FALSE, 0);
-    GtkWidget* load_plugins_link = gtk_chrome_link_button_new(
-        content.load_plugins_link_title.c_str());
-    gtk_widget_set_sensitive(load_plugins_link,
-                             content.load_plugins_link_enabled);
-    g_signal_connect(load_plugins_link, "clicked",
-                     G_CALLBACK(OnLoadPluginsLinkClickedThunk), this);
-    gtk_box_pack_start(GTK_BOX(load_plugins_link_box), load_plugins_link,
-                       FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(bubble_content), load_plugins_link_box,
-                       FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(bubble_content), gtk_hseparator_new(),
-                       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());
   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(
@@ skipping 51 matching lines @@
       return;
     }
   }
   NOTREACHED() << "unknown radio toggled";
 }
 
 void ContentSettingBubbleGtk::OnCloseButtonClicked(GtkWidget *button) {
   Close();
 }
 
+void ContentSettingBubbleGtk::OnCustomLinkClicked(GtkWidget* button) {
+  content_setting_bubble_model_->OnCustomLinkClicked();
+  Close();
+}
+
 void ContentSettingBubbleGtk::OnManageLinkClicked(GtkWidget* button) {
   content_setting_bubble_model_->OnManageLinkClicked();
   Close();
 }
-
-void ContentSettingBubbleGtk::OnClearLinkClicked(GtkWidget* button) {
-  content_setting_bubble_model_->OnClearLinkClicked();
-  Close();
-}
-
-void ContentSettingBubbleGtk::OnInfoLinkClicked(GtkWidget* button) {
-  content_setting_bubble_model_->OnInfoLinkClicked();
-  Close();
-}
-
-void ContentSettingBubbleGtk::OnLoadPluginsLinkClicked(GtkWidget* button) {
-  content_setting_bubble_model_->OnLoadPluginsLinkClicked();
-  Close();
-}