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

chrome/browser/ui/gtk/crypto_module_password_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/crypto_module_password_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "crypto/crypto_module_blocking_password_delegate.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 class CryptoModuleBlockingDialogDelegate
     : public crypto::CryptoModuleBlockingPasswordDelegate {
  public:
   CryptoModuleBlockingDialogDelegate(browser::CryptoModulePasswordReason reason,
                                      const std::string& server)
@@ skipping 132 matching lines @@
   GtkWidget* label = gtk_label_new(text.c_str());
   gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
   gtk_util::LeftAlignMisc(label);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_)->vbox), label,
                      FALSE, FALSE, 0);
 
   password_entry_ = gtk_entry_new();
   gtk_entry_set_activates_default(GTK_ENTRY(password_entry_), TRUE);
   gtk_entry_set_visibility(GTK_ENTRY(password_entry_), FALSE);
 
-  GtkWidget* password_box = gtk_hbox_new(FALSE, ui::kLabelSpacing);
+  GtkWidget* password_box = gtk_hbox_new(FALSE, gtk_util::kLabelSpacing);
   gtk_box_pack_start(GTK_BOX(password_box),
                      gtk_label_new(l10n_util::GetStringUTF8(
                          IDS_CRYPTO_MODULE_AUTH_DIALOG_PASSWORD_FIELD).c_str()),
                      FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(password_box), password_entry_,
                      TRUE, TRUE, 0);
 
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog_)->vbox), password_box,
                      FALSE, FALSE, 0);
 
@@ skipping 42 matching lines @@
 }
 
 crypto::CryptoModuleBlockingPasswordDelegate*
     NewCryptoModuleBlockingDialogDelegate(
         CryptoModulePasswordReason reason,
         const std::string& server) {
   return new CryptoModuleBlockingDialogDelegate(reason, server);
 }
 
 }  // namespace browser