Revert "content: Start splitting up chrome/browser/ui/gtk/gtk_util.h"

chrome/browser/ui/gtk/sad_tab_gtk.cc

 // Copyright (c) 2011 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/sad_tab_gtk.h"
 
 #include <string>
 
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
+#include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 // Background color of the content (a grayish blue) for a crashed tab.
 const GdkColor kCrashedBackgroundColor = GDK_COLOR_RGB(35, 48, 64);
 
 // Background color of the content (a grayish purple) for a killed
 // tab.  TODO(gspencer): update this for the "real" color when the UI
 // team provides one.  See http://crosbug.com/10711
 const GdkColor kKilledBackgroundColor = GDK_COLOR_RGB(57, 48, 88);
 
 // Construct a centered GtkLabel with a white foreground.
 // |format| is a printf-style format containing a %s;
 // |str| is substituted into the format.
 GtkWidget* MakeWhiteMarkupLabel(const char* format, const std::string& str) {
   GtkWidget* label = gtk_label_new(NULL);
   char* markup = g_markup_printf_escaped(format, str.c_str());
   gtk_label_set_markup(GTK_LABEL(label), markup);
   g_free(markup);
 
   // Center align and justify it.
   gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5);
   gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
 
   // Set text to white.
-  GdkColor white = ui::kGdkWhite;
+  GdkColor white = gtk_util::kGdkWhite;
   gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &white);
 
   return label;
 }
 
 }  // namespace
 
 SadTabGtk::SadTabGtk(TabContents* tab_contents, Kind kind)
     : tab_contents_(tab_contents),
       kind_(kind) {
@@ skipping 50 matching lines @@
 
   // Add spacer between message and link.
   spacer = gtk_label_new(" ");
   gtk_box_pack_start(GTK_BOX(vbox), spacer, FALSE, FALSE, 0);
 
   if (tab_contents_ != NULL) {
     // Add the learn-more link and center-align it in an alignment.
     GtkWidget* link = gtk_chrome_link_button_new(
         l10n_util::GetStringUTF8(IDS_LEARN_MORE).c_str());
     gtk_chrome_link_button_set_normal_color(GTK_CHROME_LINK_BUTTON(link),
-                                            &ui::kGdkWhite);
+                                            &gtk_util::kGdkWhite);
     g_signal_connect(link, "clicked", G_CALLBACK(OnLinkButtonClickThunk), this);
     GtkWidget* link_alignment = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
     gtk_container_add(GTK_CONTAINER(link_alignment), link);
     gtk_box_pack_start(GTK_BOX(vbox), link_alignment, FALSE, FALSE, 0);
   }
 
   gtk_widget_show_all(event_box_.get());
 }
 
 SadTabGtk::~SadTabGtk() {
   event_box_.Destroy();
 }
 
 void SadTabGtk::OnLinkButtonClick(GtkWidget* sender) {
   if (tab_contents_ != NULL) {
     GURL help_url =
         google_util::AppendGoogleLocaleParam(GURL(
             kind_ == CRASHED ?
             chrome::kCrashReasonURL :
             chrome::kKillReasonURL));
     tab_contents_->OpenURL(help_url, GURL(), CURRENT_TAB, PageTransition::LINK);
   }
 }