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

chrome/browser/ui/gtk/constrained_window_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/constrained_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 
 #if defined(TOUCH_UI)
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h"
 #elif defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/tab_contents/native_tab_contents_view_gtk.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
 #else
 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
 #endif
 
@@ skipping 20 matching lines @@
 
   // Unlike other users of CreateBorderBin, we need a dedicated frame around
   // our "window".
   GtkWidget* ebox = gtk_event_box_new();
   GtkWidget* frame = gtk_frame_new(NULL);
   gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT);
 
   GtkWidget* alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   if (delegate->ShouldHaveBorderPadding()) {
     gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
-        ui::kContentAreaBorder, ui::kContentAreaBorder,
-        ui::kContentAreaBorder, ui::kContentAreaBorder);
+        gtk_util::kContentAreaBorder, gtk_util::kContentAreaBorder,
+        gtk_util::kContentAreaBorder, gtk_util::kContentAreaBorder);
   }
 
   GdkColor background;
   if (delegate->GetBackgroundColor(&background)) {
     gtk_widget_modify_base(ebox, GTK_STATE_NORMAL, &background);
     gtk_widget_modify_fg(ebox, GTK_STATE_NORMAL, &background);
     gtk_widget_modify_bg(ebox, GTK_STATE_NORMAL, &background);
   }
 
   if (gtk_widget_get_parent(dialog))
@@ skipping 84 matching lines @@
 }
 
 void ConstrainedWindowGtk::OnHierarchyChanged(GtkWidget* sender,
                                               GtkWidget* previous_toplevel) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!GTK_WIDGET_TOPLEVEL(gtk_widget_get_toplevel(widget())))
     return;
 
   FocusConstrainedWindow();
 }