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

chrome/browser/ui/gtk/external_protocol_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/external_protocol_dialog_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/tab_contents/tab_util.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"
 #include "ui/base/text/text_elider.h"
 
 namespace {
 
 const int kMessageWidth = 400;
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 42 matching lines @@
       IDS_EXTERNAL_PROTOCOL_INFORMATION,
       ASCIIToUTF16(url.scheme() + ":"),
       elided_url_without_scheme) + "\n\n";
 
   message_text += l10n_util::GetStringFUTF8(
       IDS_EXTERNAL_PROTOCOL_APPLICATION_TO_LAUNCH, elided_command) + "\n\n";
 
   message_text += l10n_util::GetStringUTF8(IDS_EXTERNAL_PROTOCOL_WARNING);
 
   // Create the content-holding vbox.
-  GtkWidget* vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(vbox),
-                                 ui::kContentAreaBorder);
+                                 gtk_util::kContentAreaBorder);
 
   // Add the message text.
   GtkWidget* label = gtk_label_new(message_text.c_str());
   gtk_util::SetLabelWidth(label, kMessageWidth);
   gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 0);
 
   // Add the checkbox.
   checkbox_ = gtk_check_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_EXTERNAL_PROTOCOL_CHECKBOX_TEXT).c_str());
   gtk_box_pack_start(GTK_BOX(vbox), checkbox_,
@@ skipping 28 matching lines @@
   if (response_id == GTK_RESPONSE_ACCEPT) {
     UMA_HISTOGRAM_LONG_TIMES("clickjacking.launch_url",
                              base::TimeTicks::Now() - creation_time_);
 
     ExternalProtocolHandler::LaunchUrlWithoutSecurityCheck(url_);
   }
 
   gtk_widget_destroy(dialog_);
   delete this;
 }