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

chrome/browser/ui/gtk/theme_install_bubble_view_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/theme_install_bubble_view_gtk.h"
 
 #include <math.h>
 
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/rounded_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // Roundedness of bubble.
 static const int kBubbleCornerRadius = 4;
 
 // Padding between border of bubble and text.
 static const int kTextPadding = 8;
 
 // The bubble is partially transparent.
 static const double kBubbleOpacity = static_cast<double>(0xcc) / 0xff;
@@ skipping 66 matching lines @@
   widget_ = gtk_window_new(GTK_WINDOW_POPUP);
   gtk_container_set_border_width(GTK_CONTAINER(widget_), kTextPadding);
   GtkWidget* label = gtk_label_new(NULL);
 
   gchar* markup = g_markup_printf_escaped(
       "<span size='xx-large'>%s</span>",
       l10n_util::GetStringUTF8(IDS_THEME_LOADING_TITLE).c_str());
   gtk_label_set_markup(GTK_LABEL(label), markup);
   g_free(markup);
 
-  gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &ui::kGdkWhite);
+  gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &gtk_util::kGdkWhite);
   gtk_container_add(GTK_CONTAINER(widget_), label);
 
   // We need to show the label so we'll know the widget's actual size when we
   // call MoveWindow().
   gtk_widget_show_all(label);
 
   bool composited = false;
   if (gtk_util::IsScreenComposited()) {
     composited = true;
     GdkScreen* screen = gtk_widget_get_screen(widget_);
     GdkColormap* colormap = gdk_screen_get_rgba_colormap(screen);
 
     if (colormap)
       gtk_widget_set_colormap(widget_, colormap);
     else
       composited = false;
   }
 
   if (composited) {
     gtk_widget_set_app_paintable(widget_, TRUE);
     g_signal_connect(widget_, "expose-event",
                      G_CALLBACK(OnExposeThunk), this);
     gtk_widget_realize(widget_);
   } else {
-    gtk_widget_modify_bg(widget_, GTK_STATE_NORMAL, &ui::kGdkBlack);
+    gtk_widget_modify_bg(widget_, GTK_STATE_NORMAL, &gtk_util::kGdkBlack);
     GdkColor color;
     gtk_util::ActAsRoundedWindow(widget_, color, kBubbleCornerRadius,
                                  gtk_util::ROUNDED_ALL, gtk_util::BORDER_NONE);
   }
 
   MoveWindow();
 
   g_signal_connect(widget_, "unmap-event",
                    G_CALLBACK(OnUnmapEventThunk), this);
 
@@ skipping 44 matching lines @@
             0, M_PI_2);
   cairo_arc(cr, inner_rect.x(), inner_rect.bottom(), inset,
             M_PI_2, M_PI);
 
   cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, kBubbleOpacity);
   cairo_fill(cr);
   cairo_destroy(cr);
 
   return FALSE;
 }