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

chrome/browser/ui/gtk/importer/import_progress_dialog_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/importer/import_progress_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_observer.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 void SetItemImportStatus(GtkWidget* label, int res_id, bool is_done) {
   std::string status = l10n_util::GetStringUTF8(res_id);
   // Windows version of this has fancy throbbers to indicate progress. Here
   // we rely on text until we can have something equivalent on Linux.
   if (is_done)
     status = "\xE2\x9C\x94 " + status;  // U+2714 HEAVY CHECK MARK
@@ skipping 48 matching lines @@
   dialog_ = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_IMPORT_PROGRESS_TITLE).c_str(),
       parent_,
       (GtkDialogFlags) (GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR),
       GTK_STOCK_CANCEL,
       GTK_RESPONSE_REJECT,
       NULL);
   importer_host_->set_parent_window(GTK_WINDOW(dialog_));
 
   GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog_));
-  gtk_box_set_spacing(GTK_BOX(content_area), ui::kContentAreaSpacing);
+  gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing);
 
-  GtkWidget* control_group = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* control_group = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   GtkWidget* import_info = gtk_label_new(
       l10n_util::GetStringFUTF8(IDS_IMPORT_PROGRESS_INFO,
                                 importer_name).c_str());
   gtk_util::SetLabelWidth(import_info, 400);
   gtk_box_pack_start(GTK_BOX(control_group), import_info, FALSE, FALSE, 0);
 
-  GtkWidget* item_box = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* item_box = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   if (items_ & importer::HISTORY) {
     history_ = gtk_label_new(
         l10n_util::GetStringUTF8(IDS_IMPORT_PROGRESS_STATUS_HISTORY).c_str());
     gtk_misc_set_alignment(GTK_MISC(history_), 0, 0.5);
     gtk_box_pack_start(GTK_BOX(item_box), history_, FALSE, FALSE, 0);
   }
 
   if (items_ & importer::FAVORITES) {
     bookmarks_ = gtk_label_new(
@@ skipping 118 matching lines @@
                               const SourceProfile& source_profile,
                               Profile* profile,
                               bool first_run) {
   DCHECK_NE(0, items);
   ImportProgressDialogGtk::StartImport(
       parent, items, importer_host, importer_observer, source_profile, profile,
       first_run);
 }
 
 }  // namespace importer