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

chrome/browser/ui/gtk/fullscreen_exit_bubble_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/fullscreen_exit_bubble_gtk.h"
 
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/rounded_window.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/gtk/gtk_floating_container.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 FullscreenExitBubbleGtk::FullscreenExitBubbleGtk(
     GtkFloatingContainer* container,
     CommandUpdater::CommandUpdaterDelegate* delegate)
     : FullscreenExitBubble(delegate),
       container_(container) {
   InitWidgets();
   StartWatchingMouse();
 }
@@ skipping 13 matching lines @@
   exit_text_utf8.append(l10n_util::GetStringFUTF8(
       IDS_EXIT_FULLSCREEN_MODE, l10n_util::GetStringUTF16(IDS_APP_F11_KEY)));
   exit_text_utf8.append("</span>");
   GtkWidget* link = gtk_chrome_link_button_new_with_markup(
       exit_text_utf8.c_str());
   gtk_chrome_link_button_set_use_gtk_theme(GTK_CHROME_LINK_BUTTON(link),
                                            FALSE);
   signals_.Connect(link, "clicked", G_CALLBACK(OnLinkClickedThunk), this);
 
   link_container_.Own(gtk_util::CreateGtkBorderBin(
-      link, &ui::kGdkBlack,
+      link, &gtk_util::kGdkBlack,
       kPaddingPx, kPaddingPx, kPaddingPx, kPaddingPx));
-  gtk_util::ActAsRoundedWindow(link_container_.get(), ui::kGdkGreen,
+  gtk_util::ActAsRoundedWindow(link_container_.get(), gtk_util::kGdkGreen,
       kPaddingPx,
       gtk_util::ROUNDED_BOTTOM_LEFT | gtk_util::ROUNDED_BOTTOM_RIGHT,
       gtk_util::BORDER_NONE);
 
   slide_widget_.reset(new SlideAnimatorGtk(link_container_.get(),
       SlideAnimatorGtk::DOWN, kSlideOutDurationMs, false, false, NULL));
   gtk_widget_set_name(widget(), "exit-fullscreen-bubble");
   gtk_widget_show_all(link_container_.get());
   gtk_widget_show(widget());
   slide_widget_->OpenWithoutAnimation();
@@ skipping 71 matching lines @@
 
   g_value_set_int(&value, 0);
   gtk_container_child_set_property(GTK_CONTAINER(floating_container),
                                    widget(), "y", &value);
   g_value_unset(&value);
 }
 
 void FullscreenExitBubbleGtk::OnLinkClicked(GtkWidget* link) {
   ToggleFullscreen();
 }