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

chrome/browser/ui/gtk/collected_cookies_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/collected_cookies_gtk.h"
 
 #include <string>
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/browser/ui/gtk/constrained_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_cookie_view.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_source.h"
 #include "grit/generated_resources.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 // Width and height of the cookie tree view.
 const int kTreeViewWidth = 450;
 const int kTreeViewHeight = 150;
 
 // The page numbers of the pages in the notebook.
 const gint kAllowedPageNumber = 0;
 const gint kBlockedPageNumber = 1;
@@ skipping 53 matching lines @@
   TabSpecificContentSettings* content_settings =
       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents)->
           content_settings();
   registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
                  Source<TabSpecificContentSettings>(content_settings));
 
   Init();
 }
 
 void CollectedCookiesGtk::Init() {
-  dialog_ = gtk_vbox_new(FALSE, ui::kContentAreaSpacing);
-  gtk_box_set_spacing(GTK_BOX(dialog_), ui::kContentAreaSpacing);
+  dialog_ = gtk_vbox_new(FALSE, gtk_util::kContentAreaSpacing);
+  gtk_box_set_spacing(GTK_BOX(dialog_), gtk_util::kContentAreaSpacing);
 
   GtkWidget* label = gtk_label_new(
       l10n_util::GetStringUTF8(IDS_COLLECTED_COOKIES_DIALOG_TITLE).c_str());
   gtk_box_pack_start(GTK_BOX(dialog_), label, TRUE, TRUE, 0);
 
   notebook_ = gtk_notebook_new();
   gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook_), GTK_POS_TOP);
   gtk_box_pack_start(GTK_BOX(dialog_), notebook_, TRUE, TRUE, 0);
 
   GtkWidget* allowed_pane = CreateAllowedPane();
@@ skipping 36 matching lines @@
   gtk_box_pack_start(
       GTK_BOX(infobar_contents), infobar_label_, FALSE, FALSE, 0);
   gtk_widget_show_all(infobar_);
   gtk_widget_set_no_show_all(infobar_, TRUE);
   gtk_widget_hide(infobar_);
   gtk_box_pack_start(GTK_BOX(dialog_), infobar_, TRUE, TRUE, 0);
 
   // Close button.
   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(dialog_), button_box, FALSE, TRUE, 0);
   close_button_ = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
   gtk_button_set_label(GTK_BUTTON(close_button_),
                        l10n_util::GetStringUTF8(IDS_CLOSE).c_str());
   g_signal_connect(close_button_, "clicked", G_CALLBACK(OnCloseThunk), this);
   gtk_box_pack_end(GTK_BOX(button_box), close_button_, FALSE, TRUE, 0);
 
   // Show the dialog.
   allowed_cookies_tree_adapter_->Init();
   blocked_cookies_tree_adapter_->Init();
   EnableControls();
   ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_)));
   window_ = new ConstrainedWindowGtk(tab_contents_, this);
 }
 
 GtkWidget* CollectedCookiesGtk::CreateAllowedPane() {
-  GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   GtkWidget* label = gtk_label_new(
       l10n_util::GetStringUTF8(IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL).
           c_str());
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), label, FALSE, FALSE,
-                     ui::kControlSpacing);
+                     gtk_util::kControlSpacing);
 
   GtkWidget* scroll_window = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window),
                                  GTK_POLICY_AUTOMATIC,
                                  GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window),
                                       GTK_SHADOW_ETCHED_IN);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), scroll_window, TRUE, TRUE, 0);
 
   TabSpecificContentSettings* content_settings =
@@ skipping 27 matching lines @@
   g_signal_connect(allowed_tree_, "row-expanded",
                    G_CALLBACK(OnTreeViewRowExpandedThunk), this);
   allowed_selection_ =
       gtk_tree_view_get_selection(GTK_TREE_VIEW(allowed_tree_));
   gtk_tree_selection_set_mode(allowed_selection_, GTK_SELECTION_MULTIPLE);
   g_signal_connect(allowed_selection_, "changed",
                    G_CALLBACK(OnTreeViewSelectionChangeThunk), this);
 
   GtkWidget* button_box = gtk_hbutton_box_new();
   gtk_button_box_set_layout(GTK_BUTTON_BOX(button_box), GTK_BUTTONBOX_START);
-  gtk_box_set_spacing(GTK_BOX(button_box), ui::kControlSpacing);
+  gtk_box_set_spacing(GTK_BOX(button_box), gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), button_box, FALSE, FALSE,
-                     ui::kControlSpacing);
+                     gtk_util::kControlSpacing);
   block_allowed_cookie_button_ = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_COLLECTED_COOKIES_BLOCK_BUTTON).c_str());
   g_signal_connect(block_allowed_cookie_button_, "clicked",
                    G_CALLBACK(OnBlockAllowedButtonClickedThunk), this);
   gtk_container_add(GTK_CONTAINER(button_box), block_allowed_cookie_button_);
 
   // Wrap the vbox inside an hbox so that we can specify padding along the
   // horizontal axis.
   GtkWidget* box = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(box), cookie_list_vbox, TRUE, TRUE,
-                     ui::kControlSpacing);
+                     gtk_util::kControlSpacing);
   return box;
 }
 
 GtkWidget* CollectedCookiesGtk::CreateBlockedPane() {
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents_);
   HostContentSettingsMap* host_content_settings_map =
       wrapper->profile()->GetHostContentSettingsMap();
 
-  GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* cookie_list_vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
 
   GtkWidget* label = gtk_label_new(
       l10n_util::GetStringUTF8(
           host_content_settings_map->BlockThirdPartyCookies() ?
               IDS_COLLECTED_COOKIES_BLOCKED_THIRD_PARTY_BLOCKING_ENABLED :
               IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL).c_str());
   gtk_widget_set_size_request(label, kTreeViewWidth, -1);
   gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
   gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), label, TRUE, TRUE,
-                     ui::kControlSpacing);
+                     gtk_util::kControlSpacing);
 
   GtkWidget* scroll_window = gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window),
                                  GTK_POLICY_AUTOMATIC,
                                  GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window),
                                       GTK_SHADOW_ETCHED_IN);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), scroll_window, TRUE, TRUE, 0);
 
   TabSpecificContentSettings* content_settings = wrapper->content_settings();
@@ skipping 25 matching lines @@
   g_signal_connect(blocked_tree_, "row-expanded",
                    G_CALLBACK(OnTreeViewRowExpandedThunk), this);
   blocked_selection_ =
       gtk_tree_view_get_selection(GTK_TREE_VIEW(blocked_tree_));
   gtk_tree_selection_set_mode(blocked_selection_, GTK_SELECTION_MULTIPLE);
   g_signal_connect(blocked_selection_, "changed",
                    G_CALLBACK(OnTreeViewSelectionChangeThunk), this);
 
   GtkWidget* button_box = gtk_hbutton_box_new();
   gtk_button_box_set_layout(GTK_BUTTON_BOX(button_box), GTK_BUTTONBOX_START);
-  gtk_box_set_spacing(GTK_BOX(button_box), ui::kControlSpacing);
+  gtk_box_set_spacing(GTK_BOX(button_box), gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), button_box, FALSE, FALSE,
-                     ui::kControlSpacing);
+                     gtk_util::kControlSpacing);
   allow_blocked_cookie_button_ = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_COLLECTED_COOKIES_ALLOW_BUTTON).c_str());
   g_signal_connect(allow_blocked_cookie_button_, "clicked",
                    G_CALLBACK(OnAllowBlockedButtonClickedThunk), this);
   gtk_container_add(GTK_CONTAINER(button_box), allow_blocked_cookie_button_);
   for_session_blocked_cookie_button_ = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_COLLECTED_COOKIES_SESSION_ONLY_BUTTON).
           c_str());
   g_signal_connect(for_session_blocked_cookie_button_, "clicked",
                    G_CALLBACK(OnForSessionBlockedButtonClickedThunk), this);
   gtk_container_add(GTK_CONTAINER(button_box),
                     for_session_blocked_cookie_button_);
 
   // Wrap the vbox inside an hbox so that we can specify padding along the
   // horizontal axis.
   GtkWidget* box = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(box), cookie_list_vbox, TRUE, TRUE,
-                     ui::kControlSpacing);
+                     gtk_util::kControlSpacing);
   return box;
 }
 
 void CollectedCookiesGtk::ShowCookieInfo(gint current_page) {
   if (current_page == kAllowedPageNumber) {
     ShowSelectionInfo(allowed_selection_, allowed_cookies_tree_adapter_.get());
   } else if (current_page == kBlockedPageNumber) {
     ShowSelectionInfo(blocked_selection_, blocked_cookies_tree_adapter_.get());
   }
 }
@@ skipping 174 matching lines @@
       tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
   gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view), path, TRUE);
   g_signal_handlers_unblock_by_func(
       tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
 }
 
 void CollectedCookiesGtk::OnTreeViewSelectionChange(GtkWidget* selection) {
   EnableControls();
   ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_)));
 }