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

chrome/browser/ui/gtk/edit_search_engine_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/edit_search_engine_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_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 {
 
 std::string GetDisplayURL(const TemplateURL& turl) {
   return turl.url() ? UTF16ToUTF8(turl.url()->DisplayURL()) : std::string();
 }
 
@@ skipping 167 matching lines @@
                           reversed_percent.length(),
                           reversed_percent);
     }
   }
 
   GtkWidget* description_label = gtk_label_new(description.c_str());
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_)->vbox), description_label,
                      FALSE, FALSE, 0);
 
   gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
-                      ui::kContentAreaSpacing);
+                      gtk_util::kContentAreaSpacing);
 
   EnableControls();
 
   gtk_util::ShowDialog(dialog_);
 
   g_signal_connect(dialog_, "response", G_CALLBACK(OnResponseThunk), this);
   g_signal_connect(dialog_, "destroy", G_CALLBACK(OnWindowDestroyThunk), this);
 }
 
 string16 EditSearchEngineDialog::GetTitleInput() const {
@@ skipping 49 matching lines @@
                                  GetURLInput());
   } else {
     controller_->CleanUpCancelledAdd();
   }
   gtk_widget_destroy(dialog_);
 }
 
 void EditSearchEngineDialog::OnWindowDestroy(GtkWidget* widget) {
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }