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

chrome/browser/ui/gtk/create_application_shortcuts_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 "chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h"
 
 #include <string>
 
 #include "base/environment.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/ui/webui/extension_icon_source.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gtk_util.h"
 
 namespace {
 
 // Size (in pixels) of the icon preview.
 const int kIconPreviewSizePixels = 32;
 
 // Height (in lines) of the shortcut description label.
 const int kDescriptionLabelHeightLines = 3;
@@ skipping 60 matching lines @@
   gtk_window_set_resizable(GTK_WINDOW(create_dialog_), false);
   gtk_util::AddButtonToDialog(create_dialog_,
       l10n_util::GetStringUTF8(IDS_CANCEL).c_str(),
       GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
   gtk_util::AddButtonToDialog(create_dialog_,
       l10n_util::GetStringUTF8(IDS_CREATE_SHORTCUTS_COMMIT).c_str(),
       GTK_STOCK_APPLY, GTK_RESPONSE_ACCEPT);
 
   GtkWidget* content_area =
       gtk_dialog_get_content_area(GTK_DIALOG(create_dialog_));
-  gtk_box_set_spacing(GTK_BOX(content_area), ui::kContentAreaSpacing);
+  gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing);
 
-  GtkWidget* vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_add(GTK_CONTAINER(content_area), vbox);
 
   // Create a box containing basic information about the new shortcut: an image
   // on the left, and a description on the right.
-  GtkWidget* hbox = gtk_hbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* hbox = gtk_hbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
   gtk_container_set_border_width(GTK_CONTAINER(hbox),
-                                 ui::kControlSpacing);
+                                 gtk_util::kControlSpacing);
 
   // Put the icon preview in place.
   GtkWidget* favicon_image = gtk_image_new_from_pixbuf(favicon_pixbuf_);
   gtk_box_pack_start(GTK_BOX(hbox), favicon_image, FALSE, FALSE, 0);
 
   // Create the label with application shortcut description.
   GtkWidget* description_label = gtk_label_new(NULL);
   gtk_box_pack_start(GTK_BOX(hbox), description_label, FALSE, FALSE, 0);
   gtk_label_set_line_wrap(GTK_LABEL(description_label), TRUE);
   gtk_widget_realize(description_label);
 
   // Set the size request on the label so it knows where to line wrap. The width
   // is the desired size of the dialog less the space reserved for padding and
   // the image.
   int label_width;
   gtk_util::GetWidgetSizeFromResources(
       description_label,
       IDS_CREATE_SHORTCUTS_DIALOG_WIDTH_CHARS, -1, &label_width, NULL);
-  label_width -= ui::kControlSpacing * 3 +
+  label_width -= gtk_util::kControlSpacing * 3 +
       gdk_pixbuf_get_width(favicon_pixbuf_);
   gtk_util::SetLabelWidth(description_label, label_width);
 
   std::string description(UTF16ToUTF8(shortcut_info_.description));
   std::string title(UTF16ToUTF8(shortcut_info_.title));
   gtk_label_set_text(GTK_LABEL(description_label),
                      (description.empty() ? title : description).c_str());
 
   // Label on top of the checkboxes.
   GtkWidget* checkboxes_label = gtk_label_new(
@@ skipping 91 matching lines @@
       GTK_RESPONSE_ACCEPT,
       NULL);
   gtk_widget_realize(error_dialog_);
   gtk_util::SetWindowSizeFromResources(
       GTK_WINDOW(error_dialog_),
       IDS_CREATE_SHORTCUTS_ERROR_DIALOG_WIDTH_CHARS,
       IDS_CREATE_SHORTCUTS_ERROR_DIALOG_HEIGHT_LINES,
       false);  // resizable
   GtkWidget* content_area =
       gtk_dialog_get_content_area(GTK_DIALOG(error_dialog_));
-  gtk_box_set_spacing(GTK_BOX(content_area), ui::kContentAreaSpacing);
+  gtk_box_set_spacing(GTK_BOX(content_area), gtk_util::kContentAreaSpacing);
 
-  GtkWidget* vbox = gtk_vbox_new(FALSE, ui::kControlSpacing);
+  GtkWidget* vbox = gtk_vbox_new(FALSE, gtk_util::kControlSpacing);
   gtk_container_add(GTK_CONTAINER(content_area), vbox);
 
   // Label on top of the checkboxes.
   GtkWidget* description = gtk_label_new(
       l10n_util::GetStringFUTF8(
           IDS_CREATE_SHORTCUTS_ERROR_LABEL,
           l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)).c_str());
   gtk_label_set_line_wrap(GTK_LABEL(description), TRUE);
   gtk_misc_set_alignment(GTK_MISC(description), 0, 0);
   gtk_box_pack_start(GTK_BOX(vbox), description, FALSE, FALSE, 0);
@@ skipping 73 matching lines @@
 void CreateChromeApplicationShortcutsDialogGtk::OnImageLoaded(
     SkBitmap* image, const ExtensionResource& resource, int index) {
   if (!image || image->isNull())
     image = ExtensionIconSource::LoadImageByResourceId(IDR_APP_DEFAULT_ICON);
 
   shortcut_info_.favicon = *image;
 
   CreateIconPixBuf(*image);
   CreateDialogBox(parent_);
 }