Move base/gfx/skia_util to skia/ext/skia_util_win.

In a later pass, I will separate off the cross-platform part of this file into skia/ext/skia_util (only one function).
Review URL: http://codereview.chromium.org/13101

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

13 files changed, 13 insertions, 13 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index cfef6a6..60f1387 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -8,7 +8,6 @@
 
 #include "base/base_drag_source.h"
 #include "base/clipboard.h"
-#include "base/gfx/skia_utils.h"
 #include "base/iat_patch.h"
 #include "base/ref_counted.h"
 #include "base/scoped_clipboard_writer.h"
@@ -35,6 +34,7 @@
 #include "chrome/common/win_util.h"
 #include "chrome/views/accessibility/autocomplete_accessibility.h"
 #include "googleurl/src/url_util.h"
+#include "skia/ext/skia_utils_win.h"
 
 #include "generated_resources.h"
 
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index aaca5af..54c3c95 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -7,7 +7,6 @@
 #include <limits>
 
 #include "base/base_drag_source.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -45,6 +44,7 @@
 #include "chrome/views/widget.h"
 #include "chrome/views/window.h"
 #include "generated_resources.h"
+#include "skia/ext/skia_utils_win.h"
 
 using views::BaseButton;
 using views::DropTargetEvent;
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index e4e443d..627c387 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -11,7 +11,6 @@
 
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/shell_dialogs.h"
@@ -31,6 +30,7 @@
 #include "chrome/views/text_field.h"
 #include "chrome/views/widget.h"
 #include "generated_resources.h"
+#include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkBitmap.h"
 
 namespace {
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index b41fb55..d73191b 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -10,7 +10,6 @@
 
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/app/locales/locale_settings.h"
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 118ac10..e9a1e8b 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -11,7 +11,6 @@
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index bdf76ea..9ff07f5 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -8,7 +8,6 @@
 #include "chrome/browser/views/options/options_group_view.h"
 
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/chrome_font.h"
diff --git a/chrome/common/gfx/color_utils.cc b/chrome/common/gfx/color_utils.cc
index 0b40436..1ab1849 100644
--- a/chrome/common/gfx/color_utils.cc
+++ b/chrome/common/gfx/color_utils.cc
@@ -12,10 +12,13 @@
 #include "chrome/common/gfx/color_utils.h"
 
 #include "base/basictypes.h"
-#include "base/gfx/skia_utils.h"
 #include "base/logging.h"
 #include "skia/include/SkBitmap.h"
 
+#if defined(OS_WIN)
+#include "skia/ext/skia_utils_win.h"
+#endif
+
 namespace color_utils {
 
 // These transformations are based on the equations in:
diff --git a/chrome/views/background.cc b/chrome/views/background.cc
index 72352b7..3642924 100644
--- a/chrome/views/background.cc
+++ b/chrome/views/background.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/views/background.h"
 
-#include "base/gfx/skia_utils.h"
 #include "base/logging.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/painter.h"
 #include "chrome/views/view.h"
+#include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkPaint.h"
 
 namespace views {
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc
index 549bedf..309109a 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/chrome_menu.cc
@@ -10,7 +10,6 @@
 
 #include "base/base_drag_source.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "base/timer.h"
@@ -25,6 +24,7 @@
 #include "chrome/views/view_constants.h"
 #include "chrome/views/widget_win.h"
 #include "generated_resources.h"
+#include "skia/ext/skia_utils_win.h"
 
 #undef min
 #undef max
diff --git a/chrome/views/single_split_view.cc b/chrome/views/single_split_view.cc
index 2550c57..36e8519 100644
--- a/chrome/views/single_split_view.cc
+++ b/chrome/views/single_split_view.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/views/single_split_view.h"
 
-#include "base/gfx/skia_utils.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/background.h"
+#include "skia/ext/skia_utils_win.h"
 
 namespace views {
 
diff --git a/chrome/views/tabbed_pane.cc b/chrome/views/tabbed_pane.cc
index 2638972..4ceb2e2 100644
--- a/chrome/views/tabbed_pane.cc
+++ b/chrome/views/tabbed_pane.cc
@@ -7,7 +7,6 @@
 #include <vssym32.h>
 
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/logging.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
@@ -18,6 +17,7 @@
 #include "chrome/views/background.h"
 #include "chrome/views/root_view.h"
 #include "chrome/views/widget_win.h"
+#include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkColor.h"
 
 namespace views {
diff --git a/chrome/views/table_view.cc b/chrome/views/table_view.cc
index 8298cf6..175a96c 100644
--- a/chrome/views/table_view.cc
+++ b/chrome/views/table_view.cc
@@ -9,7 +9,6 @@
 
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/gfx/icon_util.h"
@@ -18,6 +17,7 @@
 #include "chrome/views/hwnd_view.h"
 #include "SkBitmap.h"
 #include "SkColorFilter.h"
+#include "skia/ext/skia_utils_win.h"
 
 namespace views {
 
diff --git a/chrome/views/text_field.cc b/chrome/views/text_field.cc
index 24fdc5a..7bc4859 100644
--- a/chrome/views/text_field.cc
+++ b/chrome/views/text_field.cc
@@ -12,7 +12,6 @@
 #include <vsstyle.h>
 
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
@@ -25,6 +24,7 @@
 #include "chrome/views/hwnd_view.h"
 #include "chrome/views/menu.h"
 #include "chrome/views/widget.h"
+#include "skia/ext/skia_utils_win.h"
 
 #include "generated_resources.h"