Make chrome version legible in about:chrome dialog for dark themes....

chrome/browser/gtk/about_chrome_dialog.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/about_chrome_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 28 matching lines @@
 // These are used as placeholder text around the links in the text in the about
 // dialog.
 const char* kBeginLinkChr = "BEGIN_LINK_CHR";
 const char* kBeginLinkOss = "BEGIN_LINK_OSS";
 // We don't actually use this one.
 // const char* kEndLinkChr = "END_LINK_CHR";
 const char* kEndLinkOss = "END_LINK_OSS";
 const char* kBeginLink = "BEGIN_LINK";
 const char* kEndLink = "END_LINK";
 
+const char* kSmaller = "<span size=\"smaller\">%s</span>";
+
 void OnDialogResponse(GtkDialog* dialog, int response_id) {
   // We're done.
   gtk_widget_destroy(GTK_WIDGET(dialog));
 }
 
 void FixLabelWrappingCallback(GtkWidget *label,
                               GtkAllocation *allocation,
                               gpointer data) {
   gtk_widget_set_size_request(label, allocation->width, -1);
 }
@@ skipping 13 matching lines @@
 void OnLinkButtonClick(GtkWidget* button, const char* url) {
   BrowserList::GetLastActive()->
       OpenURL(GURL(url), GURL(), NEW_WINDOW, PageTransition::LINK);
 }
 
 const char* GetChromiumUrl() {
   static std::string url(l10n_util::GetStringUTF8(IDS_CHROMIUM_PROJECT_URL));
   return url.c_str();
 }
 
+std::string Smaller(const std::string& text) {
+  return std::string("<span size=\"smaller\">") + text + std::string("</span>");
+}
+
 }  // namespace
 
 void ShowAboutDialogForProfile(GtkWindow* parent, Profile* profile) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   static GdkPixbuf* background = rb.GetPixbufNamed(IDR_ABOUT_BACKGROUND);
   scoped_ptr<FileVersionInfo> version_info(
       FileVersionInfo::CreateFileVersionInfoForCurrentModule());
   std::wstring current_version = version_info->file_version();
 #if !defined(GOOGLE_CHROME_BUILD)
   current_version += L" (";
@@ skipping 22 matching lines @@
 
   GtkWidget* hbox = gtk_hbox_new(FALSE, 0);
 
   GtkWidget* text_alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(text_alignment),
                             kPanelVertMargin, kPanelVertMargin,
                             kPanelHorizMargin, kPanelHorizMargin);
 
   GtkWidget* text_vbox = gtk_vbox_new(FALSE, kExtraLineSpacing);
 
+  GdkColor black = gfx::kGdkBlack;
   GtkWidget* product_label = MakeMarkupLabel(
       "<span font_desc=\"18\" weight=\"bold\" style=\"normal\">%s</span>",
       l10n_util::GetStringUTF8(IDS_PRODUCT_NAME));
+  gtk_widget_modify_fg(product_label, GTK_STATE_NORMAL, &black);
   gtk_box_pack_start(GTK_BOX(text_vbox), product_label, FALSE, FALSE, 0);
 
   GtkWidget* version_label = gtk_label_new(WideToUTF8(current_version).c_str());
   gtk_misc_set_alignment(GTK_MISC(version_label), 0.0, 0.5);
   gtk_label_set_selectable(GTK_LABEL(version_label), TRUE);
+  gtk_widget_modify_fg(version_label, GTK_STATE_NORMAL, &black);
   gtk_box_pack_start(GTK_BOX(text_vbox), version_label, FALSE, FALSE, 0);
 
   gtk_container_add(GTK_CONTAINER(text_alignment), text_vbox);
   gtk_box_pack_start(GTK_BOX(hbox), text_alignment, TRUE, TRUE, 0);
 
   GtkWidget* image_vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_end(GTK_BOX(image_vbox),
                    gtk_image_new_from_pixbuf(background),
                    FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(hbox), image_vbox, FALSE, FALSE, 0);
   gtk_container_add(GTK_CONTAINER(ebox), hbox);
   gtk_box_pack_start(GTK_BOX(content_area), ebox, TRUE, TRUE, 0);
 
   // We use a separate box for the licensing etc. text.  See the comment near
   // the top of this function about using a special layout for this dialog.
   GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(vbox),
                                  gtk_util::kContentAreaBorder);
 
   GtkWidget* copyright_label = MakeMarkupLabel(
-      "<span size=\"smaller\">%s</span>",
-      l10n_util::GetStringUTF8(IDS_ABOUT_VERSION_COPYRIGHT));
+      kSmaller, l10n_util::GetStringUTF8(IDS_ABOUT_VERSION_COPYRIGHT));
   gtk_box_pack_start(GTK_BOX(vbox), copyright_label, TRUE, TRUE, 5);
 
   std::string license = l10n_util::GetStringUTF8(IDS_ABOUT_VERSION_LICENSE);
   bool chromium_url_appears_first =
       license.find(kBeginLinkChr) < license.find(kBeginLinkOss);
   size_t link1 = license.find(kBeginLink);
   DCHECK(link1 != std::string::npos);
   size_t link1_end = license.find(kEndLink, link1);
   DCHECK(link1_end != std::string::npos);
   size_t link2 = license.find(kBeginLink, link1_end);
   DCHECK(link2 != std::string::npos);
   size_t link2_end = license.find(kEndLink, link2);
   DCHECK(link1_end != std::string::npos);
 
   GtkWidget* license_chunk1 = MakeMarkupLabel(
-      "<span size=\"smaller\">%s</span>",
-      license.substr(0, link1));
+      kSmaller, license.substr(0, link1));
   GtkWidget* license_chunk2 = MakeMarkupLabel(
-      "<span size=\"smaller\">%s</span>",
+      kSmaller,
       license.substr(link1_end + strlen(kEndLinkOss),
                      link2 - link1_end - strlen(kEndLinkOss)));
   GtkWidget* license_chunk3 = MakeMarkupLabel(
-      "<span size=\"smaller\">%s</span>",
-      license.substr(link2_end + strlen(kEndLinkOss)));
+      kSmaller, license.substr(link2_end + strlen(kEndLinkOss)));
 
-  std::string first_link_text =
-      std::string("<span size=\"smaller\">") +
+  std::string first_link_text = Smaller(
       license.substr(link1 + strlen(kBeginLinkOss),
-                     link1_end - link1 - strlen(kBeginLinkOss)) +
-      std::string("</span>");
-  std::string second_link_text =
-      std::string("<span size=\"smaller\">") +
+                     link1_end - link1 - strlen(kBeginLinkOss)));
+  std::string second_link_text = Smaller(
       license.substr(link2 + strlen(kBeginLinkOss),
-                     link2_end - link2 - strlen(kBeginLinkOss)) +
-      std::string("</span>");
+                     link2_end - link2 - strlen(kBeginLinkOss)));
 
   GtkWidget* first_link =
       gtk_chrome_link_button_new_with_markup(first_link_text.c_str());
   GtkWidget* second_link =
       gtk_chrome_link_button_new_with_markup(second_link_text.c_str());
   if (!chromium_url_appears_first) {
     GtkWidget* swap = second_link;
     second_link = first_link;
     first_link = swap;
   }
@@ skipping 19 matching lines @@
   GtkWidget* license_hbox2 = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(license_hbox2), second_link,
                      FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(license_hbox2), license_chunk3,
                      FALSE, FALSE, 0);
 
   GtkWidget* license_vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(license_vbox), license_hbox, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(license_vbox), license_hbox2, FALSE, FALSE, 0);
 
+#if defined(GOOGLE_CHROME_BUILD)
+  std::vector<size_t> url_offsets;
+  std::wstring text = l10n_util::GetStringF(IDS_ABOUT_TERMS_OF_SERVICE,
+                                            std::wstring(),
+                                            std::wstring(),
+                                            &url_offsets);
+
+  std::string tos_link_text = Smaller(
+      l10n_util::GetStringUTF8(IDS_TERMS_OF_SERVICE));
+  GtkWidget* tos_chunk1 = MakeMarkupLabel(
+      kSmaller, WideToUTF8(text.substr(0, url_offsets[0])).c_str());
+  GtkWidget* tos_link =
+      gtk_chrome_link_button_new_with_markup(tos_link_text.c_str());
+  GtkWidget* tos_chunk2 = MakeMarkupLabel(
+      kSmaller, WideToUTF8(text.substr(url_offsets[0])).c_str());
+
+  GtkWidget* tos_hbox = gtk_hbox_new(FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(tos_hbox), tos_chunk1, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(tos_hbox), tos_link, FALSE, FALSE, 0);
+  gtk_box_pack_start(GTK_BOX(tos_hbox), tos_chunk2, FALSE, FALSE, 0);
+
+  g_signal_connect(tos_link, "clicked", G_CALLBACK(OnLinkButtonClick),
+                   const_cast<char*>(kTOS));
+#endif
+
   gtk_box_pack_start(GTK_BOX(vbox), license_vbox, TRUE, TRUE, 0);
+  gtk_box_pack_start(GTK_BOX(vbox), tos_hbox, TRUE, TRUE, 0);
   gtk_box_pack_start(GTK_BOX(content_area), vbox, TRUE, TRUE, 0);
 
   g_signal_connect(dialog, "response", G_CALLBACK(OnDialogResponse), NULL);
   gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
   gtk_widget_show_all(dialog);
 }