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

chrome/browser/ui/gtk/find_bar_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/find_bar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 23 matching lines @@
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/native_web_keyboard_event.h"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/gtk/gtk_floating_container.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 // Used as the color of the text in the entry box and the text for the results
 // label for failure searches.
-const GdkColor kEntryTextColor = ui::kGdkBlack;
+const GdkColor kEntryTextColor = gtk_util::kGdkBlack;
 
 // Used as the color of the background of the entry box and the background of
 // the find label for successful searches.
-const GdkColor kEntryBackgroundColor = ui::kGdkWhite;
+const GdkColor kEntryBackgroundColor = gtk_util::kGdkWhite;
 const GdkColor kFindFailureBackgroundColor = GDK_COLOR_RGB(255, 102, 102);
 const GdkColor kFindSuccessTextColor = GDK_COLOR_RGB(178, 178, 178);
 
 // Padding around the container.
 const int kBarPaddingTopBottom = 4;
 const int kEntryPaddingLeft = 6;
 const int kCloseButtonPaddingLeft = 3;
 const int kBarPaddingRight = 4;
 
 // The height of the findbar dialog, as dictated by the size of the background
@@ skipping 428 matching lines @@
                               0, 0, 1, 0);
 
     // We need this event box to have its own window in GTK mode for doing the
     // hacky widget rendering.
     gtk_event_box_set_visible_window(GTK_EVENT_BOX(border_bin_), TRUE);
     gtk_widget_set_app_paintable(border_bin_, TRUE);
 
     gtk_misc_set_alignment(GTK_MISC(match_count_label_), 0.5, 0.5);
   } else {
     gtk_widget_modify_cursor(
-        text_entry_, &ui::kGdkBlack, &ui::kGdkGray);
+        text_entry_, &gtk_util::kGdkBlack, &gtk_util::kGdkGray);
     gtk_widget_modify_base(text_entry_, GTK_STATE_NORMAL,
                            &kEntryBackgroundColor);
     gtk_widget_modify_text(text_entry_, GTK_STATE_NORMAL,
                            &kEntryTextColor);
 
     // Until we switch to vector graphics, force the font size.
     gtk_util::ForceFontSizePixels(text_entry_, 13.4);  // 13.4px == 10pt @ 96dpi
     gtk_util::ForceFontSizePixels(match_count_label_, 13.4);
 
     // Force the text widget height so it lines up with the buttons regardless
@@ skipping 466 matching lines @@
 
 // static
 gboolean FindBarGtk::OnFocusOut(GtkWidget* entry, GdkEventFocus* event,
                                 FindBarGtk* find_bar) {
   g_signal_handlers_disconnect_by_func(
       gdk_keymap_get_for_display(gtk_widget_get_display(entry)),
       reinterpret_cast<gpointer>(&OnKeymapDirectionChanged), find_bar);
 
   return FALSE;  // Continue propagation.
 }