Move skia_utils_gtk.cc/.h to app/gfx/. Original patch by Thiago Farina (see http://codereview.chromium.org/660063 ), r=me.

BUG=22853
TEST=none

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40083 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index 2d0a458..9b0b902 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -33,8 +33,8 @@
 #include "net/base/escape.h"
 
 #if defined(TOOLKIT_VIEWS)
+#include "app/gfx/skia_utils_gtk.h"
 #include "chrome/browser/views/location_bar_view.h"
-#include "skia/ext/skia_utils_gtk.h"
 #else
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/location_bar_view_gtk.h"
@@ -595,7 +595,7 @@ void AutocompleteEditViewGtk::SetBaseColor() {
                  &style->text[GTK_STATE_NORMAL], NULL);
   } else {
 #if defined(TOOLKIT_VIEWS)
-    const GdkColor background_color = skia::SkColorToGdkColor(
+    const GdkColor background_color = gfx::SkColorToGdkColor(
         LocationBarView::GetColor(is_secure, LocationBarView::BACKGROUND));
     gtk_widget_modify_base(text_view_, GTK_STATE_NORMAL,
         &background_color);
diff --git a/chrome/browser/chromeos/options/settings_page_view.cc b/chrome/browser/chromeos/options/settings_page_view.cc
index 3fddf1f..e1df169 100644
--- a/chrome/browser/chromeos/options/settings_page_view.cc
+++ b/chrome/browser/chromeos/options/settings_page_view.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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/chromeos/options/settings_page_view.h"
 
-#include "skia/ext/skia_utils_gtk.h"
+#include "app/gfx/skia_utils_gtk.h"
 #include "views/controls/label.h"
 #include "views/fill_layout.h"
 #include "views/widget/widget_gtk.h"
@@ -24,7 +24,7 @@ GtkWidget* SettingsPageView::WrapInGtkWidget() {
   // Set to a solid background with the same color as the widget's bg color.
   GtkStyle* window_style = gtk_widget_get_style(widget->GetNativeView());
   set_background(views::Background::CreateSolidBackground(
-      skia::GdkColorToSkColor(window_style->bg[GTK_STATE_NORMAL])));
+      gfx::GdkColorToSkColor(window_style->bg[GTK_STATE_NORMAL])));
   widget->Show();
   // Removing the widget from the container results in unref'ing the widget. We
   // need to ref here otherwise the removal deletes the widget. The caller ends
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 1521eca..258dcc6 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -10,6 +10,7 @@
 
 #include "app/gfx/color_utils.h"
 #include "app/gfx/gtk_util.h"
+#include "app/gfx/skia_utils_gtk.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
@@ -84,7 +85,6 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "skia/ext/skia_utils_gtk.h"
 
 namespace {
 
@@ -256,7 +256,7 @@ GdkCursorType GdkWindowEdgeToGdkCursorType(GdkWindowEdge edge) {
 }
 
 GdkColor SkColorToGdkColor(const SkColor& color) {
-  return skia::SkColorToGdkColor(color);
+  return gfx::SkColorToGdkColor(color);
 }
 
 // A helper method for setting the GtkWindow size that should be used in place
diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc
index a71374b..3f4f32c 100644
--- a/chrome/browser/gtk/download_item_gtk.cc
+++ b/chrome/browser/gtk/download_item_gtk.cc
@@ -8,6 +8,7 @@
 #include "app/gfx/canvas_paint.h"
 #include "app/gfx/color_utils.h"
 #include "app/gfx/font.h"
+#include "app/gfx/skia_utils_gtk.h"
 #include "app/gfx/text_elider.h"
 #include "app/menus/simple_menu_model.h"
 #include "app/resource_bundle.h"
@@ -32,7 +33,6 @@
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "skia/ext/skia_utils_gtk.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace {
@@ -511,7 +511,7 @@ void DownloadItemGtk::UpdateStatusLabel(GtkWidget* status_label,
     // Lighten the color by blending it with the download item body color. These
     // values are taken from IDR_DOWNLOAD_BUTTON.
     SkColor blend_color = SkColorSetRGB(241, 245, 250);
-    text_color = skia::SkColorToGdkColor(
+    text_color = gfx::SkColorToGdkColor(
         color_utils::AlphaBlend(blend_color, color, 77));
   }
 
diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc
index 16adcdb..111b237 100644
--- a/chrome/browser/gtk/gtk_theme_provider.cc
+++ b/chrome/browser/gtk/gtk_theme_provider.cc
@@ -9,6 +9,7 @@
 #include "app/gfx/color_utils.h"
 #include "app/gfx/gtk_util.h"
 #include "app/gfx/skbitmap_operations.h"
+#include "app/gfx/skia_utils_gtk.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ -22,7 +23,6 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
-#include "skia/ext/skia_utils_gtk.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"
@@ -220,7 +220,7 @@ bool GtkThemeProvider::UseGtkTheme() const {
 }
 
 GdkColor GtkThemeProvider::GetGdkColor(int id) const {
-  return skia::SkColorToGdkColor(GetColor(id));
+  return gfx::SkColorToGdkColor(GetColor(id));
 }
 
 GdkColor GtkThemeProvider::GetBorderColor() const {