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

chrome/browser/ui/gtk/first_run_bubble.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/first_run_bubble.h"
 
 #include <gtk/gtk.h>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 // Markup for the text of the Omnibox search label
 const char kSearchLabelMarkup[] = "<big><b>%s</b></big>";
 
 // Padding for the buttons on first run bubble.
 const int kButtonPadding = 4;
 
 // Padding between content and edge of bubble.
@@ skipping 64 matching lines @@
     NOTREACHED();
     return;
   }
 }
 
 FirstRunBubble::~FirstRunBubble() {
 }
 
 void FirstRunBubble::InitializeContentForLarge(
     std::vector<GtkWidget*>* labels) {
-  GtkWidget* label1 = theme_service_->BuildLabel("", ui::kGdkBlack);
+  GtkWidget* label1 = theme_service_->BuildLabel("", gtk_util::kGdkBlack);
   labels->push_back(label1);
   char* markup = g_markup_printf_escaped(kSearchLabelMarkup,
       l10n_util::GetStringUTF8(IDS_FR_BUBBLE_TITLE).c_str());
   gtk_label_set_markup(GTK_LABEL(label1), markup);
   g_free(markup);
 
   GtkWidget* label2 = theme_service_->BuildLabel(
-      l10n_util::GetStringUTF8(IDS_FR_BUBBLE_SUBTEXT), ui::kGdkBlack);
+      l10n_util::GetStringUTF8(IDS_FR_BUBBLE_SUBTEXT), gtk_util::kGdkBlack);
   labels->push_back(label2);
 
   string16 search_engine = GetDefaultSearchEngineName(profile_);
   GtkWidget* label3 = theme_service_->BuildLabel(
       l10n_util::GetStringFUTF8(IDS_FR_BUBBLE_QUESTION, search_engine),
-      ui::kGdkBlack);
+      gtk_util::kGdkBlack);
   labels->push_back(label3);
 
   GtkWidget* keep_button = gtk_button_new_with_label(
       l10n_util::GetStringFUTF8(IDS_FR_BUBBLE_OK, search_engine).c_str());
   GtkWidget* change_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_FR_BUBBLE_CHANGE).c_str());
 
   gtk_box_pack_start(GTK_BOX(content_), label1, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(content_), label2, FALSE, FALSE, 0);
   // Leave an empty line.
@@ skipping 18 matching lines @@
                    G_CALLBACK(&HandleChangeButtonThunk), this);
 }
 
 void FirstRunBubble::InitializeContentForOEM(std::vector<GtkWidget*>* labels) {
   NOTIMPLEMENTED() << "Falling back to minimal bubble";
   InitializeContentForMinimal(labels);
 }
 
 void FirstRunBubble::InitializeContentForMinimal(
     std::vector<GtkWidget*>* labels) {
-  GtkWidget* label1 = theme_service_->BuildLabel("", ui::kGdkBlack);
+  GtkWidget* label1 = theme_service_->BuildLabel("", gtk_util::kGdkBlack);
   labels->push_back(label1);
   char* markup = g_markup_printf_escaped(kSearchLabelMarkup,
       l10n_util::GetStringFUTF8(
           IDS_FR_SE_BUBBLE_TITLE,
           GetDefaultSearchEngineName(profile_)).c_str());
   gtk_label_set_markup(GTK_LABEL(label1), markup);
   g_free(markup);
 
   GtkWidget* label2 = theme_service_->BuildLabel(
-      l10n_util::GetStringUTF8(IDS_FR_BUBBLE_SUBTEXT), ui::kGdkBlack);
+      l10n_util::GetStringUTF8(IDS_FR_BUBBLE_SUBTEXT), gtk_util::kGdkBlack);
   labels->push_back(label2);
 
   gtk_box_pack_start(GTK_BOX(content_), label1, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(content_), label2, FALSE, FALSE, 0);
 }
 
 void FirstRunBubble::InitializeLabels(int width_resource,
                                       std::vector<GtkWidget*>* labels) {
   int width = -1;
 
@@ skipping 16 matching lines @@
 void FirstRunBubble::HandleKeepButton(GtkWidget* sender) {
   bubble_->Close();
 }
 
 void FirstRunBubble::HandleChangeButton(GtkWidget* sender) {
   bubble_->Close();
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
   DCHECK(browser);
   browser->OpenSearchEngineOptionsDialog();
 }