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

chrome/browser/ui/gtk/ssl_client_certificate_selector.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/ssl_client_certificate_selector.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "net/base/x509_certificate.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace {
 
 enum {
   RESPONSE_SHOW_CERT_INFO = 1,
 };
@@ skipping 62 matching lines @@
 
 SSLClientCertificateSelector::SSLClientCertificateSelector(
     TabContents* parent,
     net::SSLCertRequestInfo* cert_request_info,
     SSLClientAuthHandler* delegate)
     : SSLClientAuthObserver(cert_request_info, delegate),
       cert_request_info_(cert_request_info),
       delegate_(delegate),
       parent_(parent),
       window_(NULL) {
-  root_widget_.Own(gtk_vbox_new(FALSE, ui::kControlSpacing));
+  root_widget_.Own(gtk_vbox_new(FALSE, gtk_util::kControlSpacing));
 
-  GtkWidget* site_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* site_vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(root_widget_.get()), site_vbox,
                      FALSE, FALSE, 0);
 
   GtkWidget* site_description_label = gtk_util::CreateBoldLabel(
       l10n_util::GetStringUTF8(IDS_CERT_SELECTOR_SITE_DESCRIPTION_LABEL));
   gtk_box_pack_start(GTK_BOX(site_vbox), site_description_label,
                      FALSE, FALSE, 0);
 
   GtkWidget* site_label = gtk_label_new(
       cert_request_info->host_and_port.c_str());
   gtk_util::LeftAlignMisc(site_label);
   gtk_box_pack_start(GTK_BOX(site_vbox), site_label, FALSE, FALSE, 0);
 
-  GtkWidget* selector_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* selector_vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(root_widget_.get()), selector_vbox,
                      TRUE, TRUE, 0);
 
   GtkWidget* choose_description_label = gtk_util::CreateBoldLabel(
       l10n_util::GetStringUTF8(IDS_CERT_SELECTOR_CHOOSE_DESCRIPTION_LABEL));
   gtk_box_pack_start(GTK_BOX(selector_vbox), choose_description_label,
                      FALSE, FALSE, 0);
 
 
   cert_combo_box_ = gtk_combo_box_new_text();
@@ skipping 18 matching lines @@
   // dialog.  This does however mean the dialog will grow itself if you switch
   // to different cert that has longer details text.
   GtkWidget* details_frame = gtk_frame_new(NULL);
   gtk_frame_set_shadow_type(GTK_FRAME(details_frame), GTK_SHADOW_ETCHED_IN);
   gtk_container_add(GTK_CONTAINER(details_frame), cert_details_view);
   gtk_box_pack_start(GTK_BOX(selector_vbox), details_frame, TRUE, TRUE, 0);
 
   // And then create a set of buttons like a GtkDialog would.
   GtkWidget* button_box = gtk_hbutton_box_new();
   gtk_button_box_set_layout(GTK_BUTTON_BOX(button_box), GTK_BUTTONBOX_END);
-  gtk_box_set_spacing(GTK_BOX(button_box), ui::kControlSpacing);
+  gtk_box_set_spacing(GTK_BOX(button_box), gtk_util::kControlSpacing);
   gtk_box_pack_end(GTK_BOX(root_widget_.get()), button_box, FALSE, FALSE, 0);
 
   GtkWidget* view_button = gtk_button_new_with_mnemonic(
       l10n_util::GetStringUTF8(IDS_PAGEINFO_CERT_INFO_BUTTON).c_str());
   gtk_box_pack_start(GTK_BOX(button_box), view_button, FALSE, FALSE, 0);
   g_signal_connect(view_button, "clicked",
                    G_CALLBACK(OnViewClickedThunk), this);
 
   GtkWidget* cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
   gtk_box_pack_end(GTK_BOX(button_box), cancel_button, FALSE, FALSE, 0);
@@ skipping 221 matching lines @@
     TabContents* parent,
     net::SSLCertRequestInfo* cert_request_info,
     SSLClientAuthHandler* delegate) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   (new SSLClientCertificateSelector(parent,
                                     cert_request_info,
                                     delegate))->Show();
 }
 
 }  // namespace browser