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

chrome/browser/ui/gtk/certificate_viewer.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/certificate_viewer.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "base/i18n/time_formatting.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/gtk/certificate_dialogs.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/net/x509_certificate_model.h"
 #include "grit/generated_resources.h"
 #include "net/base/x509_certificate.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gtk_util.h"
 
 namespace {
 
 const char kDetailsFontFamily[] = "monospace";
 
 ////////////////////////////////////////////////////////////////////////////////
 // Gtk utility functions.
 
@@ skipping 109 matching lines @@
           UTF8ToUTF16(
               x509_certificate_model::GetTitle(
                   cert_chain_list_.front()))).c_str(),
       parent,
       // Non-modal.
       GTK_DIALOG_NO_SEPARATOR,
       GTK_STOCK_CLOSE,
       GTK_RESPONSE_CLOSE,
       NULL);
   gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(dialog_)->vbox),
-                      ui::kContentAreaSpacing);
+                      gtk_util::kContentAreaSpacing);
 
   x509_certificate_model::RegisterDynamicOids();
   InitGeneralPage();
   InitDetailsPage();
 
   notebook_ = gtk_notebook_new();
   gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog_)->vbox), notebook_);
 
   gtk_notebook_append_page(
       GTK_NOTEBOOK(notebook_),
@@ skipping 14 matching lines @@
   g_signal_connect(dialog_, "response", G_CALLBACK(OnResponse), NULL);
   g_signal_connect(dialog_, "destroy", G_CALLBACK(OnDestroy), this);
 }
 
 CertificateViewer::~CertificateViewer() {
   x509_certificate_model::DestroyCertChain(&cert_chain_list_);
 }
 
 void CertificateViewer::InitGeneralPage() {
   net::X509Certificate::OSCertHandle cert = cert_chain_list_.front();
-  general_page_vbox_ = gtk_vbox_new(FALSE, ui::kContentAreaSpacing);
+  general_page_vbox_ = gtk_vbox_new(FALSE, gtk_util::kContentAreaSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(general_page_vbox_),
-                                 ui::kContentAreaBorder);
+                                 gtk_util::kContentAreaBorder);
 
-  GtkWidget* uses_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* uses_vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(general_page_vbox_), uses_vbox, FALSE, FALSE, 0);
   gtk_box_pack_start(
       GTK_BOX(uses_vbox),
       gtk_util::CreateBoldLabel(
           l10n_util::GetStringUTF8(IDS_CERT_INFO_VERIFIED_USAGES_GROUP)),
       FALSE, FALSE, 0);
 
   std::vector<std::string> usages;
   x509_certificate_model::GetUsageStrings(cert, &usages);
   for (size_t i = 0; i < usages.size(); ++i)
     gtk_box_pack_start(
         GTK_BOX(uses_vbox),
         gtk_util::IndentWidget(gtk_util::LeftAlignMisc(gtk_label_new(
             usages[i].c_str()))),
         FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(general_page_vbox_), gtk_hseparator_new(),
                      FALSE, FALSE, 0);
 
   const int num_rows = 21;
   GtkTable* table = GTK_TABLE(gtk_table_new(num_rows, 2, FALSE));
-  gtk_table_set_col_spacing(table, 0, ui::kLabelSpacing);
-  gtk_table_set_row_spacings(table, ui::kControlSpacing);
+  gtk_table_set_col_spacing(table, 0, gtk_util::kLabelSpacing);
+  gtk_table_set_row_spacings(table, gtk_util::kControlSpacing);
 
   gtk_box_pack_start(GTK_BOX(general_page_vbox_), GTK_WIDGET(table),
                      FALSE, FALSE, 0);
   int row = 0;
   const std::string alternative_text =
       l10n_util::GetStringUTF8(IDS_CERT_INFO_FIELD_NOT_PRESENT);
   AddTitle(table, row++,
            l10n_util::GetStringUTF8(IDS_CERT_INFO_SUBJECT_GROUP));
   AddKeyValue(table, row++,
               l10n_util::GetStringUTF8(IDS_CERT_INFO_COMMON_NAME_LABEL),
@@ skipping 293 matching lines @@
 // static
 GtkTreeStore* CertificateViewer::CreateFieldsTreeStore(
     net::X509Certificate::OSCertHandle cert) {
   GtkTreeStore* fields_store = gtk_tree_store_new(FIELDS_COLUMNS, G_TYPE_STRING,
                                                   G_TYPE_STRING);
   FillTreeStoreWithCertFields(fields_store, cert);
   return fields_store;
 }
 
 void CertificateViewer::InitDetailsPage() {
-  details_page_vbox_ = gtk_vbox_new(FALSE, ui::kContentAreaSpacing);
+  details_page_vbox_ = gtk_vbox_new(FALSE, gtk_util::kContentAreaSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(details_page_vbox_),
-                                 ui::kContentAreaBorder);
+                                 gtk_util::kContentAreaBorder);
 
-  GtkWidget* hierarchy_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* hierarchy_vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(details_page_vbox_), hierarchy_vbox,
                      FALSE, FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(hierarchy_vbox),
                      gtk_util::CreateBoldLabel(l10n_util::GetStringUTF8(
                          IDS_CERT_DETAILS_CERTIFICATE_HIERARCHY_LABEL)),
                      FALSE, FALSE, 0);
 
   GtkTreeStore* hierarchy_store = gtk_tree_store_new(HIERARCHY_COLUMNS,
                                                      G_TYPE_STRING,
@@ skipping 18 matching lines @@
   GtkWidget* hierarchy_scroll_window = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(hierarchy_scroll_window),
                                  GTK_POLICY_AUTOMATIC,
                                  GTK_POLICY_NEVER);
   gtk_scrolled_window_set_shadow_type(
       GTK_SCROLLED_WINDOW(hierarchy_scroll_window), GTK_SHADOW_ETCHED_IN);
   gtk_container_add(GTK_CONTAINER(hierarchy_scroll_window), hierarchy_tree);
   gtk_box_pack_start(GTK_BOX(hierarchy_vbox),
                      hierarchy_scroll_window, FALSE, FALSE, 0);
 
-  GtkWidget* fields_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* fields_vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(details_page_vbox_), fields_vbox,
                      TRUE, TRUE, 0);
   gtk_box_pack_start(GTK_BOX(fields_vbox),
                      gtk_util::CreateBoldLabel(l10n_util::GetStringUTF8(
                          IDS_CERT_DETAILS_CERTIFICATE_FIELDS_LABEL)),
                      FALSE, FALSE, 0);
 
   fields_tree_ = gtk_tree_view_new();
   gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(fields_tree_), FALSE);
   gtk_tree_view_append_column(
       GTK_TREE_VIEW(fields_tree_),
       gtk_tree_view_column_new_with_attributes("", gtk_cell_renderer_text_new(),
                                                "text", FIELDS_NAME,
                                                NULL));
   GtkTreeSelection* fields_selection = gtk_tree_view_get_selection(
       GTK_TREE_VIEW(fields_tree_));
   gtk_tree_selection_set_mode(fields_selection, GTK_SELECTION_SINGLE);
   g_signal_connect(fields_selection, "changed",
                    G_CALLBACK(OnFieldsSelectionChanged), this);
   GtkWidget* fields_scroll_window = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(fields_scroll_window),
                                  GTK_POLICY_AUTOMATIC,
                                  GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type(
       GTK_SCROLLED_WINDOW(fields_scroll_window), GTK_SHADOW_ETCHED_IN);
   gtk_container_add(GTK_CONTAINER(fields_scroll_window), fields_tree_);
   gtk_box_pack_start(GTK_BOX(fields_vbox),
                      fields_scroll_window, TRUE, TRUE, 0);
 
-  GtkWidget* value_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* value_vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(details_page_vbox_), value_vbox,
                      TRUE, TRUE, 0);
   gtk_box_pack_start(GTK_BOX(value_vbox),
                      gtk_util::CreateBoldLabel(l10n_util::GetStringUTF8(
                          IDS_CERT_DETAILS_CERTIFICATE_FIELD_VALUE_LABEL)),
                      FALSE, FALSE, 0);
 
   // TODO(mattm): fix text view coloring (should have grey background).
   GtkWidget* field_value_view = gtk_text_view_new();
   gtk_text_view_set_editable(GTK_TEXT_VIEW(field_value_view), FALSE);
@@ skipping 100 matching lines @@
                            net::X509Certificate::OSCertHandle cert) {
   net::X509Certificate::OSCertHandles cert_chain;
   x509_certificate_model::GetCertChainFromCert(cert, &cert_chain);
   (new CertificateViewer(parent, cert_chain))->Show();
 }
 
 void ShowCertificateViewer(gfx::NativeWindow parent,
                            net::X509Certificate* cert) {
   ShowCertificateViewer(parent, cert->os_cert_handle());
 }