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

chrome/browser/ui/gtk/extensions/extension_install_dialog_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 <gtk/gtk.h>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gtk_util.h"
 
 namespace {
 
 const int kRightColumnMinWidth = 290;
 const int kImageSize = 69;
 
 // Padding on all sides of each permission in the permissions list.
 const int kPermissionsPadding = 8;
@@ skipping 40 matching lines @@
       cancel > 0 ? l10n_util::GetStringUTF8(cancel).c_str(): GTK_STOCK_CANCEL,
       GTK_RESPONSE_CLOSE);
   gtk_dialog_add_button(
       GTK_DIALOG(dialog),
       l10n_util::GetStringUTF8(ExtensionInstallUI::kButtonIds[type]).c_str(),
       GTK_RESPONSE_ACCEPT);
   gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE);
 
   // Create a two column layout.
   GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
-  gtk_box_set_spacing(GTK_BOX(content_area), ui::kContentAreaSpacing);
+  gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing);
 
-  GtkWidget* icon_hbox = gtk_hbox_new(FALSE, ui::kContentAreaSpacing);
+  GtkWidget* icon_hbox = gtk_hbox_new(FALSE, gtk_util::kContentAreaSpacing);
   gtk_box_pack_start(GTK_BOX(content_area), icon_hbox, TRUE, TRUE, 0);
 
   // Resize the icon if necessary.
   SkBitmap scaled_icon = *skia_icon;
   if (scaled_icon.width() > kImageSize || scaled_icon.height() > kImageSize) {
     scaled_icon = skia::ImageOperations::Resize(scaled_icon,
         skia::ImageOperations::RESIZE_LANCZOS3,
         kImageSize, kImageSize);
   }
 
   // Put Icon in the left column.
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&scaled_icon);
   GtkWidget* icon = gtk_image_new_from_pixbuf(pixbuf);
   g_object_unref(pixbuf);
   gtk_box_pack_start(GTK_BOX(icon_hbox), icon, FALSE, FALSE, 0);
   // Top justify the image.
   gtk_misc_set_alignment(GTK_MISC(icon), 0.5, 0.0);
 
   // Create a new vbox for the right column.
-  GtkWidget* right_column_area = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* right_column_area = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(icon_hbox), right_column_area, TRUE, TRUE, 0);
 
   std::string heading_text = l10n_util::GetStringFUTF8(
       ExtensionInstallUI::kHeadingIds[type], UTF8ToUTF16(extension->name()));
   GtkWidget* heading_label = MakeMarkupLabel("<span weight=\"bold\">%s</span>",
                                              heading_text);
   gtk_label_set_line_wrap(GTK_LABEL(heading_label), true);
   gtk_misc_set_alignment(GTK_MISC(heading_label), 0.0, 0.5);
   bool show_permissions = !permissions.empty();
   // If we are not going to show the permissions, vertically center the title.
@@ skipping 77 matching lines @@
   BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>(
       browser->window());
   if (!browser_window) {
     delegate->InstallUIAbort(false);
     return;
   }
 
   ShowInstallDialog(
       browser_window->window(), icon, extension, delegate, permissions, type);
 }