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

chrome/browser/ui/gtk/gtk_chrome_cookie_view.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/gtk_chrome_cookie_view.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/ui/gtk/gtk_util.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/bytes_formatting.h"
 
 namespace {
 
 void InitBrowserDetailStyle(GtkWidget* entry, GtkStyle* label_style,
                             GtkStyle* dialog_style) {
   gtk_widget_modify_fg(entry, GTK_STATE_NORMAL,
                        &label_style->fg[GTK_STATE_NORMAL]);
   gtk_widget_modify_fg(entry, GTK_STATE_INSENSITIVE,
@@ skipping 267 matching lines @@
 
 void BuildWidgets(GtkChromeCookieView *self, gboolean editable_expiration) {
   self->table_box_ = gtk_vbox_new(FALSE, 0);
   gtk_widget_set_no_show_all(self->table_box_, TRUE);
 
   // Cookie details.
   self->cookie_details_table_ = gtk_table_new(7, 2, FALSE);
   gtk_container_add(GTK_CONTAINER(self->table_box_),
                     self->cookie_details_table_);
   gtk_table_set_col_spacing(GTK_TABLE(self->cookie_details_table_), 0,
-                            ui::kLabelSpacing);
+                            gtk_util::kLabelSpacing);
 
   int row = 0;
   self->first_label_ = InitDetailRow(row++, IDS_COOKIES_COOKIE_NAME_LABEL,
                 self->cookie_details_table_, &self->cookie_name_entry_);
   InitDetailRow(row++, IDS_COOKIES_COOKIE_CONTENT_LABEL,
                 self->cookie_details_table_, &self->cookie_content_entry_);
   InitDetailRow(row++, IDS_COOKIES_COOKIE_DOMAIN_LABEL,
                 self->cookie_details_table_, &self->cookie_domain_entry_);
   InitDetailRow(row++, IDS_COOKIES_COOKIE_PATH_LABEL,
                 self->cookie_details_table_, &self->cookie_path_entry_);
   InitDetailRow(row++, IDS_COOKIES_COOKIE_SENDFOR_LABEL,
                 self->cookie_details_table_, &self->cookie_send_for_entry_);
   InitDetailRow(row++, IDS_COOKIES_COOKIE_CREATED_LABEL,
                 self->cookie_details_table_, &self->cookie_created_entry_);
   if (editable_expiration) {
     InitComboboxRow(row++, IDS_COOKIES_COOKIE_EXPIRES_LABEL,
                     self->cookie_details_table_,
                     &self->cookie_expires_combobox_,
                     &self->cookie_expires_combobox_store_);
   } else {
     InitDetailRow(row++, IDS_COOKIES_COOKIE_EXPIRES_LABEL,
                   self->cookie_details_table_, &self->cookie_expires_entry_);
   }
 
   // Database details.
   self->database_details_table_ = gtk_table_new(4, 2, FALSE);
   gtk_container_add(GTK_CONTAINER(self->table_box_),
                     self->database_details_table_);
   gtk_table_set_col_spacing(GTK_TABLE(self->database_details_table_), 0,
-                            ui::kLabelSpacing);
+                            gtk_util::kLabelSpacing);
 
   InitDetailRow(row++, IDS_COOKIES_COOKIE_NAME_LABEL,
                 self->database_details_table_, &self->database_name_entry_);
   InitDetailRow(row++, IDS_COOKIES_WEB_DATABASE_DESCRIPTION_LABEL,
                 self->database_details_table_,
                 &self->database_description_entry_);
   InitDetailRow(row++, IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL,
                 self->database_details_table_, &self->database_size_entry_);
   InitDetailRow(row++, IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL,
                 self->database_details_table_,
                 &self->database_last_modified_entry_);
 
   // Local storage details.
   self->local_storage_details_table_ = gtk_table_new(3, 2, FALSE);
   gtk_container_add(GTK_CONTAINER(self->table_box_),
                     self->local_storage_details_table_);
   gtk_table_set_col_spacing(GTK_TABLE(self->local_storage_details_table_), 0,
-                            ui::kLabelSpacing);
+                            gtk_util::kLabelSpacing);
 
   row = 0;
   InitDetailRow(row++, IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL,
                 self->local_storage_details_table_,
                 &self->local_storage_origin_entry_);
   InitDetailRow(row++, IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL,
                 self->local_storage_details_table_,
                 &self->local_storage_size_entry_);
   InitDetailRow(row++, IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL,
                 self->local_storage_details_table_,
                 &self->local_storage_last_modified_entry_);
 
   // AppCache details.
   self->appcache_details_table_ = gtk_table_new(4, 2, FALSE);
   gtk_container_add(GTK_CONTAINER(self->table_box_),
                     self->appcache_details_table_);
   gtk_table_set_col_spacing(GTK_TABLE(self->appcache_details_table_), 0,
-                            ui::kLabelSpacing);
+                            gtk_util::kLabelSpacing);
 
   row = 0;
   InitDetailRow(row++, IDS_COOKIES_APPLICATION_CACHE_MANIFEST_LABEL,
                 self->appcache_details_table_,
                 &self->appcache_manifest_entry_);
   InitDetailRow(row++, IDS_COOKIES_SIZE_LABEL,
                 self->appcache_details_table_, &self->appcache_size_entry_);
   InitDetailRow(row++, IDS_COOKIES_COOKIE_CREATED_LABEL,
                 self->appcache_details_table_, &self->appcache_created_entry_);
   InitDetailRow(row++, IDS_COOKIES_LAST_ACCESSED_LABEL,
                 self->appcache_details_table_,
                 &self->appcache_last_accessed_entry_);
 
   // IndexedDB details.
   self->indexed_db_details_table_ = gtk_table_new(4, 2, FALSE);
   gtk_container_add(GTK_CONTAINER(self->table_box_),
                     self->indexed_db_details_table_);
   gtk_table_set_col_spacing(GTK_TABLE(self->indexed_db_details_table_), 0,
-                            ui::kLabelSpacing);
+                            gtk_util::kLabelSpacing);
 
   row = 0;
   InitDetailRow(row++, IDS_COOKIES_LOCAL_STORAGE_ORIGIN_LABEL,
                 self->indexed_db_details_table_,
                 &self->indexed_db_origin_entry_);
   InitDetailRow(row++, IDS_COOKIES_LOCAL_STORAGE_SIZE_ON_DISK_LABEL,
                 self->indexed_db_details_table_, &self->indexed_db_size_entry_);
   InitDetailRow(row++, IDS_COOKIES_LOCAL_STORAGE_LAST_MODIFIED_LABEL,
                 self->indexed_db_details_table_,
                 &self->indexed_db_last_modified_entry_);
 
   // Local storage item.
   self->local_storage_item_table_ = gtk_table_new(3, 2, FALSE);
   gtk_container_add(GTK_CONTAINER(self->table_box_),
                     self->local_storage_item_table_);
   gtk_table_set_col_spacing(GTK_TABLE(self->local_storage_item_table_), 0,
-                            ui::kLabelSpacing);
+                            gtk_util::kLabelSpacing);
 
   row = 0;
   InitDetailRow(row++, IDS_COOKIES_COOKIE_DOMAIN_LABEL,
                 self->local_storage_item_table_,
                 &self->local_storage_item_origin_entry_);
   InitDetailRow(row++, IDS_COOKIES_LOCAL_STORAGE_KEY_LABEL,
                 self->local_storage_item_table_,
                 &self->local_storage_item_key_entry_);
   InitDetailRow(row++, IDS_COOKIES_LOCAL_STORAGE_VALUE_LABEL,
                 self->local_storage_item_table_,
                 &self->local_storage_item_value_entry_);
 
   // Database accessed prompt.
   self->database_accessed_table_ = gtk_table_new(2, 2, FALSE);
   gtk_container_add(GTK_CONTAINER(self->table_box_),
                     self->database_accessed_table_);
   gtk_table_set_col_spacing(GTK_TABLE(self->local_storage_item_table_), 0,
-                            ui::kLabelSpacing);
+                            gtk_util::kLabelSpacing);
 
   row = 0;
   InitDetailRow(row++, IDS_COOKIES_COOKIE_DOMAIN_LABEL,
                 self->database_accessed_table_,
                 &self->database_accessed_origin_entry_);
   InitDetailRow(row++, IDS_COOKIES_WEB_DATABASE_NAME,
                 self->database_accessed_table_,
                 &self->database_accessed_name_entry_);
   InitDetailRow(row++, IDS_COOKIES_WEB_DATABASE_DESCRIPTION_LABEL,
                 self->database_accessed_table_,
                 &self->database_accessed_description_entry_);
   InitDetailRow(row++, IDS_COOKIES_SIZE_LABEL,
                 self->database_accessed_table_,
                 &self->database_accessed_size_entry_);
 
   // AppCache created prompt.
   self->appcache_created_table_ = gtk_table_new(1, 2, FALSE);
   gtk_container_add(GTK_CONTAINER(self->table_box_),
                     self->appcache_created_table_);
   gtk_table_set_col_spacing(GTK_TABLE(self->appcache_created_table_), 0,
-                            ui::kLabelSpacing);
+                            gtk_util::kLabelSpacing);
   row = 0;
   InitDetailRow(row++, IDS_COOKIES_APPLICATION_CACHE_MANIFEST_LABEL,
                 self->appcache_created_table_,
                 &self->appcache_created_manifest_entry_);
 
   gtk_frame_set_shadow_type(GTK_FRAME(self), GTK_SHADOW_ETCHED_IN);
   gtk_container_add(GTK_CONTAINER(self), self->table_box_);
 }
 
 GtkWidget* gtk_chrome_cookie_view_new(gboolean editable_expiration) {
@@ skipping 204 matching lines @@
   int store_size = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
   if (store_size == 1)
     return false;
 
   DCHECK_EQ(2, store_size);
 
   int selected = gtk_combo_box_get_active(GTK_COMBO_BOX(
       self->cookie_expires_combobox_));
   return selected == 1;
 }