GTK: Give the aboot dialog a facelift....

chrome/browser/gtk/gtk_chrome_link_button.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/gtk_chrome_link_button.h"
 
 #include <stdlib.h>
 
 #include "base/logging.h"
 
-static const char* kLinkMarkup = "<u><span color=\"%s\">%s</span></u>";
+static const gchar* kLinkMarkup = "<u><span color=\"%s\">%s</span></u>";
 
 namespace {
 
 // Set the GTK style on our custom link button. We don't want any border around
 // the link text.
 void SetLinkButtonStyle() {
   static bool style_was_set = false;
 
   if (style_was_set)
     return;
   style_was_set = true;
 
   gtk_rc_parse_string(
       "style \"chrome-link-button\" {"
       "  GtkButton::inner-border = {0, 0, 0, 0}"
+      "  GtkButton::child-displacement-x = 0"
+      "  GtkButton::child-displacement-y = 0"
       "  xthickness = 0"
       "  ythickness = 0"
       "}"
       "widget \"*chrome-link-button\" style \"chrome-link-button\"");
 }
 
 }  // namespace
 
 G_BEGIN_DECLS
 G_DEFINE_TYPE(GtkChromeLinkButton, gtk_chrome_link_button, GTK_TYPE_BUTTON)
@@ skipping 121 matching lines @@
   button->is_blue = TRUE;
   button->hand_cursor = gdk_cursor_new(GDK_HAND2);
   button->click_button_event = NULL;
 
   gtk_container_add(GTK_CONTAINER(button), button->label);
   gtk_widget_set_name(GTK_WIDGET(button), "chrome-link-button");
   gtk_widget_set_app_paintable(GTK_WIDGET(button), TRUE);
 }
 
 static void gtk_chrome_link_button_set_text(GtkChromeLinkButton* button,
-                                            const char* text) {
+                                            const char* text,
+                                            bool contains_markup) {
   // We should have only been called once or we'd leak the markups.
   DCHECK(!button->blue_markup && !button->red_markup);
 
-  button->blue_markup = g_markup_printf_escaped(kLinkMarkup, "blue", text);
-  button->red_markup = g_markup_printf_escaped(kLinkMarkup, "red", text);
+  if (!contains_markup) {
+    button->blue_markup = g_markup_printf_escaped(kLinkMarkup, "blue", text);
+    button->red_markup = g_markup_printf_escaped(kLinkMarkup, "red", text);
+  } else {
+    button->blue_markup = static_cast<gchar*>(
+        g_malloc(strlen(kLinkMarkup) + strlen("blue") + strlen(text) + 1));
+    sprintf(button->blue_markup, kLinkMarkup, "blue", text);
+
+    button->red_markup = static_cast<gchar*>(
+        g_malloc(strlen(kLinkMarkup) + strlen("red") + strlen(text) + 1));
+    sprintf(button->red_markup, kLinkMarkup, "red", text);
+  }
+
   gtk_label_set_markup(GTK_LABEL(button->label), button->blue_markup);
   button->is_blue = TRUE;
 }
 
 GtkWidget* gtk_chrome_link_button_new(const char* text) {
   GtkWidget* lb = GTK_WIDGET(g_object_new(GTK_TYPE_CHROME_LINK_BUTTON, NULL));
-  gtk_chrome_link_button_set_text(GTK_CHROME_LINK_BUTTON(lb), text);
+  gtk_chrome_link_button_set_text(GTK_CHROME_LINK_BUTTON(lb), text, false);
+  return lb;
+}
+
+GtkWidget* gtk_chrome_link_button_new_with_markup(const char* markup) {
+  GtkWidget* lb = GTK_WIDGET(g_object_new(GTK_TYPE_CHROME_LINK_BUTTON, NULL));
+  gtk_chrome_link_button_set_text(GTK_CHROME_LINK_BUTTON(lb), markup, true);
   return lb;
 }
 
 const GdkEventButton* gtk_chrome_link_button_get_event_for_click(
     GtkChromeLinkButton* button) {
   return button->click_button_event;
 }
 
 G_END_DECLS