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

chrome/browser/ui/gtk/gtk_theme_service.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/gtk_theme_service.h"
 
 #include <gtk/gtk.h>
 
 #include <set>
 #include <string>
@@ skipping 18 matching lines @@
 #include "content/common/notification_details.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_source.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkShader.h"
-#include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/skia_utils_gtk.h"
 
@@ skipping 182 matching lines @@
       icon, state == GTK_STATE_NORMAL);
 
   gtk_icon_set_add_source(icon_set, icon);
   gtk_icon_source_free(icon);
 }
 
 // Applies an HSL shift to a GdkColor (instead of an SkColor)
 void GdkColorHSLShift(const color_utils::HSL& shift, GdkColor* frame_color) {
   SkColor shifted = color_utils::HSLShift(GdkToSkColor(frame_color), shift);
   frame_color->pixel = 0;
-  frame_color->red = SkColorGetR(shifted) * ui::kSkiaToGDKMultiplier;
-  frame_color->green = SkColorGetG(shifted) * ui::kSkiaToGDKMultiplier;
-  frame_color->blue = SkColorGetB(shifted) * ui::kSkiaToGDKMultiplier;
+  frame_color->red = SkColorGetR(shifted) * kSkiaToGDKMultiplier;
+  frame_color->green = SkColorGetG(shifted) * kSkiaToGDKMultiplier;
+  frame_color->blue = SkColorGetB(shifted) * kSkiaToGDKMultiplier;
 }
 
 }  // namespace
 
 GtkWidget* GtkThemeService::icon_widget_ = NULL;
 GdkPixbuf* GtkThemeService::default_folder_icon_ = NULL;
 GdkPixbuf* GtkThemeService::default_bookmark_icon_ = NULL;
 
 // static
 GtkThemeService* GtkThemeService::GetFrom(Profile* profile) {
@@ skipping 941 matching lines @@
   cairo_set_line_width(cr, 1.0);
   cairo_move_to(cr, start_x, widget->allocation.y);
   cairo_line_to(cr, start_x,
                 widget->allocation.y + widget->allocation.height);
   cairo_stroke(cr);
   cairo_destroy(cr);
   cairo_pattern_destroy(pattern);
 
   return TRUE;
 }