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

chrome/browser/ui/gtk/first_run_dialog.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_dialog.h"
 
 #include <string>
 #include <vector>
 
 #include "base/i18n/rtl.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/gtk/gtk_floating_container.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"
 
 #if defined(USE_LINUX_BREAKPAD)
 #include "chrome/app/breakpad_linux.h"
 #endif
 
 #if defined(GOOGLE_CHROME_BUILD)
 #include "chrome/browser/browser_process.h"
@@ skipping 29 matching lines @@
 void SetWelcomePosition(GtkFloatingContainer* container,
                         GtkAllocation* allocation,
                         GtkWidget* label) {
   GValue value = { 0, };
   g_value_init(&value, G_TYPE_INT);
 
   GtkRequisition req;
   gtk_widget_size_request(label, &req);
 
   int x = base::i18n::IsRTL() ?
-      allocation->width - req.width - ui::kContentAreaSpacing :
-      ui::kContentAreaSpacing;
+      allocation->width - req.width - gtk_util::kContentAreaSpacing :
+      gtk_util::kContentAreaSpacing;
   g_value_set_int(&value, x);
   gtk_container_child_set_property(GTK_CONTAINER(container),
                                    label, "x", &value);
 
   int y = allocation->height / 2 - req.height / 2;
   g_value_set_int(&value, y);
   gtk_container_child_set_property(GTK_CONTAINER(container),
                                    label, "y", &value);
   g_value_unset(&value);
 }
@@ skipping 113 matching lines @@
   gtk_floating_container_add_floating(GTK_FLOATING_CONTAINER(top_area),
                                       welcome_message);
   g_signal_connect(top_area, "set-floating-position",
                    G_CALLBACK(SetWelcomePosition), welcome_message);
 
   gtk_box_pack_start(GTK_BOX(content_area), top_area,
                      FALSE, FALSE, 0);
 
   GtkWidget* bubble_area_background = gtk_event_box_new();
   gtk_widget_modify_bg(bubble_area_background,
-                       GTK_STATE_NORMAL, &ui::kGdkWhite);
+                       GTK_STATE_NORMAL, &gtk_util::kGdkWhite);
 
   GtkWidget* bubble_area_box = gtk_vbox_new(FALSE, 0);
   gtk_container_set_border_width(GTK_CONTAINER(bubble_area_box),
-                                 ui::kContentAreaSpacing);
+                                 gtk_util::kContentAreaSpacing);
   gtk_container_add(GTK_CONTAINER(bubble_area_background),
                     bubble_area_box);
 
   GtkWidget* explanation = gtk_label_new(
       l10n_util::GetStringFUTF8(IDS_FR_SEARCH_TEXT,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)).c_str());
-  gtk_util::SetLabelColor(explanation, &ui::kGdkBlack);
+  gtk_util::SetLabelColor(explanation, &gtk_util::kGdkBlack);
   gtk_util::SetLabelWidth(explanation, kExplanationWidth);
   gtk_box_pack_start(GTK_BOX(bubble_area_box), explanation, FALSE, FALSE, 0);
 
   // We will fill this in after the TemplateURLService has loaded.
   // GtkHButtonBox because we want all children to have the same size.
   search_engine_hbox_ = gtk_hbutton_box_new();
   gtk_box_set_spacing(GTK_BOX(search_engine_hbox_), kSearchEngineSpacing);
   gtk_box_pack_start(GTK_BOX(bubble_area_box), search_engine_hbox_,
                      FALSE, FALSE, 0);
 
@@ skipping 82 matching lines @@
       ballot_engines.end()) {
     ballot_engines.push_back(default_search_engine);
   }
 
   std::string choose_text = l10n_util::GetStringUTF8(IDS_FR_SEARCH_CHOOSE);
   for (std::vector<const TemplateURL*>::iterator search_engine_iter =
            ballot_engines.begin();
        search_engine_iter < ballot_engines.end();
        ++search_engine_iter) {
     // Create a container for the search engine widgets.
-    GtkWidget* vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+    GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
     // We show text on Chromium and images on Google Chrome.
     bool show_images = false;
 #if defined(GOOGLE_CHROME_BUILD)
     show_images = true;
 #endif
 
     // Create the image (maybe).
     int logo_id = (*search_engine_iter)->logo_id();
     if (show_images && logo_id > 0) {
@@ skipping 90 matching lines @@
 }
 
 void FirstRunDialog::FirstRunDone() {
   FirstRun::SetShowWelcomePagePref();
 
   if (dialog_)
     gtk_widget_destroy(dialog_);
   MessageLoop::current()->Quit();
   delete this;
 }