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

chrome/browser/ui/gtk/page_info_bubble_gtk.cc

Index: chrome/browser/ui/gtk/page_info_bubble_gtk.cc
diff --git a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
index e6c2edf2ba00925d6913b0efae09c64acdc804b5..115ad4064109be867cc6d5fa73737afe83b80a91 100644
--- a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc
@@ -25,6 +25,7 @@
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 class Profile;
@@ -135,9 +136,9 @@ void PageInfoBubbleGtk::BubbleClosing(BubbleGtk* bubble,
 
 void PageInfoBubbleGtk::InitContents() {
   if (!contents_) {
-    contents_ = gtk_vbox_new(FALSE, gtk_util::kContentAreaSpacing);
+    contents_ = gtk_vbox_new(FALSE, ui::kContentAreaSpacing);
     gtk_container_set_border_width(GTK_CONTAINER(contents_),
-                                   gtk_util::kContentAreaBorder);
+                                   ui::kContentAreaBorder);
   } else {
     gtk_util::RemoveAllChildren(contents_);
   }
@@ -165,7 +166,7 @@ void PageInfoBubbleGtk::InitContents() {
 
 GtkWidget* PageInfoBubbleGtk::CreateSection(
     const PageInfoModel::SectionInfo& section) {
-  GtkWidget* section_box = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
+  GtkWidget* section_box = gtk_hbox_new(FALSE, ui::kControlSpacing);
 
   GdkPixbuf* pixbuf = *model_.GetIconImage(section.icon_id);
   if (pixbuf) {
@@ -174,12 +175,12 @@ GtkWidget* PageInfoBubbleGtk::CreateSection(
     gtk_misc_set_alignment(GTK_MISC(image), 0, 0);
   }
 
-  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
+  GtkWidget* vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(section_box), vbox, TRUE, TRUE, 0);
 
   if (!section.headline.empty()) {
     GtkWidget* label = theme_service_->BuildLabel(
-        UTF16ToUTF8(section.headline), gtk_util::kGdkBlack);
+        UTF16ToUTF8(section.headline), ui::kGdkBlack);
     gtk_label_set_selectable(GTK_LABEL(label), TRUE);
     PangoAttrList* attributes = pango_attr_list_new();
     pango_attr_list_insert(attributes,
@@ -193,7 +194,7 @@ GtkWidget* PageInfoBubbleGtk::CreateSection(
     gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
   }
   GtkWidget* label = theme_service_->BuildLabel(
-      UTF16ToUTF8(section.description), gtk_util::kGdkBlack);
+      UTF16ToUTF8(section.description), ui::kGdkBlack);
   gtk_label_set_selectable(GTK_LABEL(label), TRUE);
   gtk_util::SetLabelWidth(label, 400);
   // Allow linebreaking in the middle of words if necessary, so that extremely