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

chrome/browser/ui/gtk/bookmarks/bookmark_utils_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/bookmarks/bookmark_utils_gtk.h"
 
 #include "base/pickle.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia_paint.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/gtk_util.h"
 
 namespace {
 
 // Spacing between the favicon and the text.
 const int kBarButtonPadding = 4;
@@ skipping 244 matching lines @@
   if (provider->UsingNativeTheme()) {
     gtk_util::SetLabelColor(label, NULL);
   } else {
     GdkColor color = provider->GetGdkColor(
         ThemeService::COLOR_BOOKMARK_TEXT);
     gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &color);
     gtk_widget_modify_fg(label, GTK_STATE_INSENSITIVE, &color);
 
     // Because the prelight state is a white image that doesn't change by the
     // theme, force the text color to black when it would be used.
-    gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &ui::kGdkBlack);
-    gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &ui::kGdkBlack);
+    gtk_widget_modify_fg(label, GTK_STATE_ACTIVE, &gtk_util::kGdkBlack);
+    gtk_widget_modify_fg(label, GTK_STATE_PRELIGHT, &gtk_util::kGdkBlack);
   }
 }
 
 // DnD-related -----------------------------------------------------------------
 
 int GetCodeMask(bool folder) {
   int rv = ui::CHROME_BOOKMARK_ITEM;
   if (!folder) {
     rv |= ui::TEXT_URI_LIST |
           ui::TEXT_HTML |
@@ skipping 143 matching lines @@
   GURL url;
   string16 title;
   if (!ui::ExtractNetscapeURL(selection_data, &url, &title))
     return false;
 
   model->AddURL(parent, idx, title, url);
   return true;
 }
 
 }  // namespace bookmark_utils