Move more files to toplevel gfx.

TBR=darin
BUG=none
TEST=none


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

108 files changed, 136 insertions, 135 deletions

diff --git a/app/app.gyp b/app/app.gyp
index cf4f3d9..d0418dd 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -39,10 +39,7 @@
       'sources': [
         'animation_unittest.cc',
         'clipboard/clipboard_unittest.cc',
-        'gfx/color_utils_unittest.cc',
         'gfx/font_unittest.cc',
-        'gfx/native_theme_win_unittest.cc',
-        'gfx/skbitmap_operations_unittest.cc',
         'gfx/text_elider_unittest.cc',
         'l10n_util_mac_unittest.mm',
         'l10n_util_unittest.cc',
@@ -68,7 +65,6 @@
         }],
         ['OS!="win"', {
           'sources!': [
-            'gfx/native_theme_win_unittest.cc',
             'os_exchange_data_win_unittest.cc',
             'win_util_unittest.cc',
           ],
diff --git a/app/app_base.gypi b/app/app_base.gypi
index a28f8f52..df49c71 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -114,9 +114,6 @@
         'gfx/canvas_linux.cc',
         'gfx/canvas_mac.mm',
         'gfx/canvas_win.cc',
-        'gfx/color_utils.cc',
-        'gfx/color_utils.h',
-        'gfx/favicon_size.h',
         'gfx/font.h',
         'gfx/font_gtk.cc',
         'gfx/font_mac.mm',
@@ -124,16 +121,6 @@
         'gfx/font_util.h',
         'gfx/font_util.cc',
         'gfx/font_win.cc',
-        'gfx/gdi_util.cc',
-        'gfx/gdi_util.h',
-        'gfx/native_theme_win.cc',
-        'gfx/native_theme_win.h',
-        'gfx/skbitmap_operations.cc',
-        'gfx/skbitmap_operations.h',
-        'gfx/skia_util.cc',
-        'gfx/skia_util.h',
-        'gfx/skia_utils_gtk.cc',
-        'gfx/skia_utils_gtk.h',
         'gfx/text_elider.cc',
         'gfx/text_elider.h',
         'gtk_dnd_util.cc',
diff --git a/app/win_util.cc b/app/win_util.cc
index 3e3d890..a85ca9b 100644
--- a/app/win_util.cc
+++ b/app/win_util.cc
@@ -11,7 +11,6 @@
 
 #include <algorithm>
 
-#include "app/gfx/gdi_util.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/base_switches.h"
@@ -26,6 +25,7 @@
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "gfx/codec/png_codec.h"
+#include "gfx/gdi_util.h"
 
 // Ensure that we pick up this link library.
 #pragma comment(lib, "dwmapi.lib")
diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc
index bef5c4a..3830498 100644
--- a/chrome/browser/aeropeek_manager.cc
+++ b/chrome/browser/aeropeek_manager.cc
@@ -7,7 +7,6 @@
 #include <dwmapi.h>
 #include <shobjidl.h>
 
-#include "app/gfx/gdi_util.h"
 #include "app/win_util.h"
 #include "app/win/window_impl.h"
 #include "base/command_line.h"
@@ -27,6 +26,7 @@
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
+#include "gfx/gdi_util.h"
 #include "gfx/icon_util.h"
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index 207c70c..73bd8fc 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -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 "gfx/skia_utils_gtk.h"
 #else
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/location_bar_view_gtk.h"
diff --git a/chrome/browser/browser_theme_pack.cc b/chrome/browser/browser_theme_pack.cc
index 58bcf1c..05bcff0 100644
--- a/chrome/browser/browser_theme_pack.cc
+++ b/chrome/browser/browser_theme_pack.cc
@@ -9,7 +9,6 @@
 #include <set>
 #include <vector>
 
-#include "app/gfx/skbitmap_operations.h"
 #include "app/resource_bundle.h"
 #include "base/data_pack.h"
 #include "base/logging.h"
@@ -22,6 +21,7 @@
 #include "chrome/browser/theme_resources_util.h"
 #include "chrome/common/extensions/extension.h"
 #include "gfx/codec/png_codec.h"
+#include "gfx/skbitmap_operations.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/file_stream.h"
diff --git a/chrome/browser/browser_theme_pack.h b/chrome/browser/browser_theme_pack.h
index 33acdca..9160ba6 100644
--- a/chrome/browser/browser_theme_pack.h
+++ b/chrome/browser/browser_theme_pack.h
@@ -8,10 +8,10 @@
 #include <map>
 #include <string>
 
-#include "app/gfx/color_utils.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/ref_counted.h"
+#include "gfx/color_utils.h"
 #include "chrome/common/extensions/extension.h"
 
 class BrowserThemeProviderTest;
diff --git a/chrome/browser/browser_theme_pack_unittest.cc b/chrome/browser/browser_theme_pack_unittest.cc
index 3068248..1a05582 100644
--- a/chrome/browser/browser_theme_pack_unittest.cc
+++ b/chrome/browser/browser_theme_pack_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/browser_theme_pack.h"
 
-#include "app/gfx/color_utils.h"
 #include "app/theme_provider.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/json_value_serializer.h"
+#include "gfx/color_utils.h"
 #include "grit/theme_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index 76cd7ab..fabeb9c 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/browser_theme_provider.h"
 
-#include "app/gfx/skbitmap_operations.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/stl_util-inl.h"
@@ -26,6 +25,7 @@
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/codec/png_codec.h"
+#include "gfx/skbitmap_operations.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/file_stream.h"
diff --git a/chrome/browser/browser_theme_provider_mac.mm b/chrome/browser/browser_theme_provider_mac.mm
index c4dccfe..292ad08 100644
--- a/chrome/browser/browser_theme_provider_mac.mm
+++ b/chrome/browser/browser_theme_provider_mac.mm
@@ -6,9 +6,9 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "app/gfx/color_utils.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_theme_pack.h"
+#include "gfx/color_utils.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h"
 
diff --git a/chrome/browser/chromeos/options/settings_page_view.cc b/chrome/browser/chromeos/options/settings_page_view.cc
index e1df169..e6afc30 100644
--- a/chrome/browser/chromeos/options/settings_page_view.cc
+++ b/chrome/browser/chromeos/options/settings_page_view.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/chromeos/options/settings_page_view.h"
 
-#include "app/gfx/skia_utils_gtk.h"
+#include "gfx/skia_utils_gtk.h"
 #include "views/controls/label.h"
 #include "views/fill_layout.h"
 #include "views/widget/widget_gtk.h"
diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc
index 2486a57..5beb856 100644
--- a/chrome/browser/chromeos/status/network_menu_button.cc
+++ b/chrome/browser/chromeos/status/network_menu_button.cc
@@ -7,13 +7,13 @@
 #include <limits>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/skbitmap_operations.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
+#include "gfx/skbitmap_operations.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/widget/widget.h"
diff --git a/chrome/browser/chromeos/status/status_area_button.cc b/chrome/browser/chromeos/status/status_area_button.cc
index 8a695b1..cf52779 100644
--- a/chrome/browser/chromeos/status/status_area_button.cc
+++ b/chrome/browser/chromeos/status/status_area_button.cc
@@ -5,8 +5,8 @@
 #include "chrome/browser/chromeos/status/status_area_button.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/skbitmap_operations.h"
 #include "app/resource_bundle.h"
+#include "gfx/skbitmap_operations.h"
 #include "grit/theme_resources.h"
 #include "views/border.h"
 #include "views/view.h"
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc
index 7c0caaf..ed09962 100644
--- a/chrome/browser/dom_ui/ntp_resource_cache.cc
+++ b/chrome/browser/dom_ui/ntp_resource_cache.cc
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "app/animation.h"
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
@@ -32,6 +31,7 @@
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "gfx/color_utils.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index d45263e..c43daac 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/extensions/extensions_ui.h"
 
-#include "app/gfx/color_utils.h"
-#include "app/gfx/skbitmap_operations.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/base64.h"
@@ -43,6 +41,8 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "gfx/codec/png_codec.h"
+#include "gfx/color_utils.h"
+#include "gfx/skbitmap_operations.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index 6c36329..d835b38 100644
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -6,7 +6,6 @@
 
 #include "build/build_config.h"
 
-#include "app/gfx/favicon_size.h"
 #include "base/callback.h"
 #include "base/ref_counted_memory.h"
 #include "chrome/browser/profile.h"
@@ -16,6 +15,7 @@
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "gfx/codec/png_codec.h"
+#include "gfx/favicon_size.h"
 #include "skia/ext/image_operations.h"
 
 FavIconHelper::FavIconHelper(TabContents* tab_contents)
diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc
index 5c1130d..92ea4b9d 100644
--- a/chrome/browser/gtk/browser_titlebar.cc
+++ b/chrome/browser/gtk/browser_titlebar.cc
@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>
 
-#include "app/gfx/skbitmap_operations.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
@@ -34,6 +33,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/gtk_util.h"
+#include "gfx/skbitmap_operations.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index e2f3ec6..873ad44 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -8,8 +8,6 @@
 
 #include <string>
 
-#include "app/gfx/color_utils.h"
-#include "app/gfx/skia_utils_gtk.h"
 #include "app/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ -80,8 +78,10 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/color_utils.h"
 #include "gfx/gtk_util.h"
 #include "gfx/rect.h"
+#include "gfx/skia_utils_gtk.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/gtk/custom_button.cc b/chrome/browser/gtk/custom_button.cc
index 0514660..22bdb6c 100644
--- a/chrome/browser/gtk/custom_button.cc
+++ b/chrome/browser/gtk/custom_button.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/gtk/custom_button.h"
 
-#include "app/gfx/skbitmap_operations.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
@@ -15,6 +14,7 @@
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/common/notification_service.h"
 #include "gfx/gtk_util.h"
+#include "gfx/skbitmap_operations.h"
 #include "grit/theme_resources.h"
 
 CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeProvider* theme_provider,
diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc
index d996bc5..98637e9 100644
--- a/chrome/browser/gtk/download_item_gtk.cc
+++ b/chrome/browser/gtk/download_item_gtk.cc
@@ -7,9 +7,7 @@
 #include "app/gtk_util.h"
 #include "app/l10n_util.h"
 #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,6 +30,8 @@
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/color_utils.h"
+#include "gfx/skia_utils_gtk.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc
index 69a4569..7438bbf 100644
--- a/chrome/browser/gtk/gtk_theme_provider.cc
+++ b/chrome/browser/gtk/gtk_theme_provider.cc
@@ -6,9 +6,6 @@
 
 #include <gtk/gtk.h>
 
-#include "app/gfx/color_utils.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"
@@ -23,6 +20,9 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
+#include "gfx/color_utils.h"
+#include "gfx/skbitmap_operations.h"
+#include "gfx/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"
diff --git a/chrome/browser/gtk/gtk_theme_provider.h b/chrome/browser/gtk/gtk_theme_provider.h
index cc036f9..8e40d6f 100644
--- a/chrome/browser/gtk/gtk_theme_provider.h
+++ b/chrome/browser/gtk/gtk_theme_provider.h
@@ -9,10 +9,10 @@
 #include <string>
 #include <vector>
 
-#include "app/gfx/color_utils.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/owned_widget_gtk.h"
+#include "gfx/color_utils.h"
 
 class CairoCachedSurface;
 class Profile;
diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
index a288022..87b48e1 100644
--- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc
@@ -8,8 +8,6 @@
 #include <utility>
 
 #include "app/gfx/canvas_paint.h"
-#include "app/gfx/favicon_size.h"
-#include "app/gfx/skbitmap_operations.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/throb_animation.h"
@@ -22,6 +20,8 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/favicon_size.h"
+#include "gfx/skbitmap_operations.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 84a37da..7fbaf47 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/importer/importer.h"
 
-#include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "base/thread.h"
@@ -21,6 +20,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/codec/png_codec.h"
+#include "gfx/favicon_size.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/image_operations.h"
 #include "webkit/glue/image_decoder.h"
diff --git a/chrome/browser/ntp_background_util.cc b/chrome/browser/ntp_background_util.cc
index 3f7a1bc..40a331d 100644
--- a/chrome/browser/ntp_background_util.cc
+++ b/chrome/browser/ntp_background_util.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/ntp_background_util.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/skia_util.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "gfx/rect.h"
+#include "gfx/skia_util.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index c3bfb6b..5fb1b3f 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/gdi_util.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/simple_thread.h"
@@ -12,6 +11,7 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
+#include "gfx/gdi_util.h"
 #include "net/url_request/url_request_unittest.h"
 #include "printing/image.h"
 #include "printing/printing_test.h"
diff --git a/chrome/browser/renderer_host/backing_store_win.cc b/chrome/browser/renderer_host/backing_store_win.cc
index ede1c40..c1e77f0 100644
--- a/chrome/browser/renderer_host/backing_store_win.cc
+++ b/chrome/browser/renderer_host/backing_store_win.cc
@@ -4,12 +4,12 @@
 
 #include "chrome/browser/renderer_host/backing_store_win.h"
 
-#include "app/gfx/gdi_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/transport_dib.h"
+#include "gfx/gdi_util.h"
 #include "skia/ext/platform_canvas.h"
 
 namespace {
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index c3b0356..3996a8a 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/gdi_util.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
@@ -29,6 +28,7 @@
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/render_messages.h"
+#include "gfx/gdi_util.h"
 #include "gfx/rect.h"
 #include "grit/webkit_resources.h"
 #include "skia/ext/skia_utils_win.h"
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index bc9af41..09201d6 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/search_engines/template_url.h"
 
-#include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/logging.h"
@@ -12,6 +11,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/search_engines/template_url_model.h"
+#include "gfx/favicon_size.h"
 #include "net/base/escape.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/tab_contents/thumbnail_generator.cc b/chrome/browser/tab_contents/thumbnail_generator.cc
index 9aa8fa6..212045e 100644
--- a/chrome/browser/tab_contents/thumbnail_generator.cc
+++ b/chrome/browser/tab_contents/thumbnail_generator.cc
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "app/gfx/skbitmap_operations.h"
 #include "base/histogram.h"
 #include "base/time.h"
 #include "build/build_config.h"
@@ -15,6 +14,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/property_bag.h"
 #include "gfx/rect.h"
+#include "gfx/skbitmap_operations.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index ddea13a..443a86f 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -6,18 +6,18 @@
 
 #include "app/bidi_line_iterator.h"
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
-#include "base/i18n/word_iterator.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/file_version_info.h"
+#include "base/i18n/word_iterator.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/platform_util.h"
 #include "chrome/common/url_constants.h"
+#include "gfx/color_utils.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/browser/views/appcache_info_view.cc b/chrome/browser/views/appcache_info_view.cc
index 8cc53c2..ade35f8 100644
--- a/chrome/browser/views/appcache_info_view.cc
+++ b/chrome/browser/views/appcache_info_view.cc
@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
index c6eeff0..77c9ae3 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -6,7 +6,6 @@
 
 #include "app/bidi_line_iterator.h"
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
@@ -15,6 +14,7 @@
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/views/bubble_border.h"
+#include "gfx/color_utils.h"
 #include "gfx/insets.h"
 #include "gfx/path.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/autofill_profiles_view_win.cc b/chrome/browser/views/autofill_profiles_view_win.cc
index 54ac769..ff88e82 100644
--- a/chrome/browser/views/autofill_profiles_view_win.cc
+++ b/chrome/browser/views/autofill_profiles_view_win.cc
@@ -7,7 +7,6 @@
 #include <vssym32.h>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/theme_resources_util.h"
 #include "chrome/browser/window_sizer.h"
+#include "gfx/native_theme_win.h"
 #include "gfx/size.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index b6d7519..77a6763 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/views/bookmark_bubble_view.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/keyboard_codes.h"
@@ -18,6 +17,7 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/event.h"
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 289a9cc..d7b0dd8 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -7,8 +7,6 @@
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
-#include "app/gfx/skia_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/keyboard_codes.h"
@@ -30,6 +28,8 @@
 #include "chrome/browser/views/bookmark_folder_tree_view.h"
 #include "chrome/browser/views/bookmark_table_view.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/color_utils.h"
+#include "gfx/skia_util.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/cookie_info_view.cc b/chrome/browser/views/cookie_info_view.cc
index 8929335..23922b3 100644
--- a/chrome/browser/views/cookie_info_view.cc
+++ b/chrome/browser/views/cookie_info_view.cc
@@ -7,13 +7,13 @@
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "chrome/browser/profile.h"
+#include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/border.h"
diff --git a/chrome/browser/views/cookie_prompt_view.cc b/chrome/browser/views/cookie_prompt_view.cc
index 1c84dd5..46642b3 100644
--- a/chrome/browser/views/cookie_prompt_view.cc
+++ b/chrome/browser/views/cookie_prompt_view.cc
@@ -7,7 +7,6 @@
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop.h"
@@ -22,6 +21,7 @@
 #include "chrome/browser/views/local_storage_set_item_info_view.h"
 #include "chrome/browser/views/options/content_settings_window_view.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/cookie_monster.h"
diff --git a/chrome/browser/views/database_info_view.cc b/chrome/browser/views/database_info_view.cc
index 4f5eb54..70596e3 100644
--- a/chrome/browser/views/database_info_view.cc
+++ b/chrome/browser/views/database_info_view.cc
@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
diff --git a/chrome/browser/views/database_open_info_view.cc b/chrome/browser/views/database_open_info_view.cc
index 0a81793..24f4c50 100644
--- a/chrome/browser/views/database_open_info_view.cc
+++ b/chrome/browser/views/database_open_info_view.cc
@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
diff --git a/chrome/browser/views/detachable_toolbar_view.cc b/chrome/browser/views/detachable_toolbar_view.cc
index a3773e6..5b31f3d 100644
--- a/chrome/browser/views/detachable_toolbar_view.cc
+++ b/chrome/browser/views/detachable_toolbar_view.cc
@@ -5,9 +5,9 @@
 #include "chrome/browser/views/detachable_toolbar_view.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/skia_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser_theme_provider.h"
+#include "gfx/skia_util.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkShader.h"
diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index 12877c8..05ec139 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/views/download_shelf_view.h"
+#include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/native_button.h"
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index 6191f5d..7f21bca 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -5,11 +5,11 @@
 #include "chrome/browser/views/info_bubble.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "base/keyboard_codes.h"
 #include "chrome/browser/views/bubble_border.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/notification_service.h"
+#include "gfx/color_utils.h"
 #include "gfx/path.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "views/fill_layout.h"
diff --git a/chrome/browser/views/local_storage_info_view.cc b/chrome/browser/views/local_storage_info_view.cc
index e47536c..35c7c49 100644
--- a/chrome/browser/views/local_storage_info_view.cc
+++ b/chrome/browser/views/local_storage_info_view.cc
@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
diff --git a/chrome/browser/views/local_storage_set_item_info_view.cc b/chrome/browser/views/local_storage_set_item_info_view.cc
index 3eb13ef..aa620ef 100644
--- a/chrome/browser/views/local_storage_set_item_info_view.cc
+++ b/chrome/browser/views/local_storage_set_item_info_view.cc
@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index 98823bc..6021532 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -9,7 +9,6 @@
 #endif
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
@@ -31,6 +30,7 @@
 #include "chrome/browser/views/content_blocked_bubble_contents.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index 756396e..ab09db9 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -14,7 +14,6 @@
 
 #include "app/combobox_model.h"
 #include "app/gfx/canvas.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
@@ -40,6 +39,7 @@
 #include "chrome/browser/views/options/fonts_languages_window_view.h"
 #include "chrome/browser/views/restart_message_box.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/native_theme_win.h"
 #include "grit/app_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/options/content_filter_page_view.cc b/chrome/browser/views/options/content_filter_page_view.cc
index badd057..b74267f 100644
--- a/chrome/browser/views/options/content_filter_page_view.cc
+++ b/chrome/browser/views/options/content_filter_page_view.cc
@@ -5,13 +5,13 @@
 #include "chrome/browser/views/options/content_filter_page_view.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/options/exceptions_view.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/native_theme_win.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/button/radio_button.h"
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 5e70111..7c28557 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -10,7 +10,6 @@
 #include <vssym32.h>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
@@ -25,6 +24,7 @@
 #include "chrome/browser/views/options/options_group_view.h"
 #include "chrome/browser/views/options/passwords_exceptions_window_view.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/native_theme_win.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/button/radio_button.h"
diff --git a/chrome/browser/views/options/cookie_filter_page_view.cc b/chrome/browser/views/options/cookie_filter_page_view.cc
index 574397e..ac8ac6d 100644
--- a/chrome/browser/views/options/cookie_filter_page_view.cc
+++ b/chrome/browser/views/options/cookie_filter_page_view.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/views/options/cookie_filter_page_view.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser.h"
@@ -16,6 +15,7 @@
 #include "chrome/browser/views/options/cookies_view.h"
 #include "chrome/browser/views/options/exceptions_view.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/native_theme_win.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/button/checkbox.h"
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index cdbb5f3..eddd30c 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -7,7 +7,6 @@
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop.h"
@@ -17,6 +16,7 @@
 #include "chrome/browser/views/cookie_info_view.h"
 #include "chrome/browser/views/database_info_view.h"
 #include "chrome/browser/views/local_storage_info_view.h"
+#include "gfx/color_utils.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/cookie_monster.h"
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index 34d119f..5b92361 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -14,7 +14,6 @@
 #include "app/combobox_model.h"
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_collator.h"
 #include "app/resource_bundle.h"
@@ -26,6 +25,7 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/native_theme_win.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 4c56faa..260baa3 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -11,7 +11,6 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
@@ -27,6 +26,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/spellcheck_common.h"
+#include "gfx/native_theme_win.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index f0c2974..bbd24b0 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -9,9 +9,9 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "gfx/native_theme_win.h"
 #include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc
index 29a8226..4af6681 100644
--- a/chrome/browser/views/sad_tab_view.cc
+++ b/chrome/browser/views/sad_tab_view.cc
@@ -5,11 +5,11 @@
 #include "chrome/browser/views/sad_tab_view.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/skia_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "gfx/size.h"
+#include "gfx/skia_util.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc
index aa65191..1fa805b 100644
--- a/chrome/browser/views/tab_icon_view.cc
+++ b/chrome/browser/views/tab_icon_view.cc
@@ -10,7 +10,6 @@
 #endif
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/favicon_size.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ -18,6 +17,7 @@
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_constants.h"
+#include "gfx/favicon_size.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 
diff --git a/chrome/browser/views/tabs/side_tab.cc b/chrome/browser/views/tabs/side_tab.cc
index ac41c8a..c08eaaa 100644
--- a/chrome/browser/views/tabs/side_tab.cc
+++ b/chrome/browser/views/tabs/side_tab.cc
@@ -5,11 +5,11 @@
 #include "chrome/browser/views/tabs/side_tab.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/skia_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/path.h"
+#include "gfx/skia_util.h"
 #include "grit/app_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/image_button.h"
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index 6b5e1f9..db07e33 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -7,9 +7,7 @@
 #include <limits>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/favicon_size.h"
 #include "app/gfx/font.h"
-#include "app/gfx/skbitmap_operations.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
@@ -20,6 +18,8 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
+#include "gfx/favicon_size.h"
+#include "gfx/skbitmap_operations.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/gpu/gpu_backing_store_win.cc b/chrome/gpu/gpu_backing_store_win.cc
index 1b4dcd5..a38e8b9 100644
--- a/chrome/gpu/gpu_backing_store_win.cc
+++ b/chrome/gpu/gpu_backing_store_win.cc
@@ -4,12 +4,12 @@
 
 #include "chrome/gpu/gpu_backing_store_win.h"
 
-#include "app/gfx/gdi_util.h"
 #include "app/win_util.h"
 #include "base/logging.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_view_win.h"
 #include "chrome/gpu/gpu_thread.h"
+#include "gfx/gdi_util.h"
 
 namespace {
 
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index 03b4862..c036da5 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -8,7 +8,6 @@
 
 #include "app/gfx/canvas.h"
 #if defined(OS_WIN)
-#include "app/gfx/gdi_util.h"
 #include "app/win_util.h"
 #endif
 #if defined(OS_MACOSX)
@@ -26,6 +25,9 @@
 #include "chrome/plugin/plugin_channel.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "gfx/blit.h"
+#if defined(OS_WIN)
+#include "gfx/gdi_util.h"
+#endif
 #include "skia/ext/platform_device.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index d057a7c..855db43 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -8,8 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "app/gfx/color_utils.h"
-#include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "app/resource_bundle.h"
@@ -61,6 +59,8 @@
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "chrome/renderer/websharedworker_proxy.h"
 #include "chrome/renderer/webworker_proxy.h"
+#include "gfx/color_utils.h"
+#include "gfx/favicon_size.h"
 #include "gfx/native_widget_types.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
@@ -122,7 +122,7 @@
 #if defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * theming
-#include "app/gfx/native_theme_win.h"
+#include "gfx/native_theme_win.h"
 #elif defined(USE_X11)
 #include "third_party/WebKit/WebKit/chromium/public/linux/WebRenderTheme.h"
 #endif
diff --git a/chrome/renderer/renderer_main_platform_delegate_win.cc b/chrome/renderer/renderer_main_platform_delegate_win.cc
index 430107a7..9b3ea65 100644
--- a/chrome/renderer/renderer_main_platform_delegate_win.cc
+++ b/chrome/renderer/renderer_main_platform_delegate_win.cc
@@ -4,12 +4,12 @@
 
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 
-#include "app/gfx/native_theme_win.h"
 #include "base/command_line.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/injection_test_dll.h"
+#include "gfx/native_theme_win.h"
 #include "sandbox/src/sandbox.h"
 #include "unicode/timezone.h"
 
diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc
index 4353ac0..33ad51a 100644
--- a/chrome/renderer/webplugin_delegate_pepper.cc
+++ b/chrome/renderer/webplugin_delegate_pepper.cc
@@ -14,10 +14,6 @@
 #include <string>
 #include <vector>
 
-#if defined(OS_WIN)
-#include "app/gfx/gdi_util.h"
-#include "app/gfx/native_theme_win.h"
-#endif
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/message_loop.h"
@@ -35,6 +31,8 @@
 #include "gfx/blit.h"
 #if defined(OS_WIN)
 #include "gfx/codec/jpeg_codec.h"
+#include "gfx/gdi_util.h"
+#include "gfx/native_theme_win.h"
 #include "skia/ext/vector_platform_device.h"
 #endif
 #include "third_party/npapi/bindings/npapi_extensions.h"
diff --git a/app/gfx/color_utils.cc b/gfx/color_utils.cc
index ebc886a..268f556 100644
--- a/app/gfx/color_utils.cc
+++ b/gfx/color_utils.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/color_utils.h"
+#include "gfx/color_utils.h"
 
 #include <math.h>
 #if defined(OS_WIN)
diff --git a/app/gfx/color_utils.h b/gfx/color_utils.h
index 3e2f8bf..3e2f8bf 100644
--- a/app/gfx/color_utils.h
+++ b/gfx/color_utils.h
diff --git a/app/gfx/color_utils_unittest.cc b/gfx/color_utils_unittest.cc
index 9ba7cb8..363d700 100644
--- a/app/gfx/color_utils_unittest.cc
+++ b/gfx/color_utils_unittest.cc
@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 
-#include "app/gfx/color_utils.h"
+#include "gfx/color_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
diff --git a/app/gfx/favicon_size.h b/gfx/favicon_size.h
index 3fe9cd8..3fe9cd8 100644
--- a/app/gfx/favicon_size.h
+++ b/gfx/favicon_size.h
diff --git a/app/gfx/gdi_util.cc b/gfx/gdi_util.cc
index 2711280..5dbb5b5 100644
--- a/app/gfx/gdi_util.cc
+++ b/gfx/gdi_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/gdi_util.h"
+#include "gfx/gdi_util.h"
 
 namespace gfx {
 
diff --git a/app/gfx/gdi_util.h b/gfx/gdi_util.h
index 7da4926..7da4926 100644
--- a/app/gfx/gdi_util.h
+++ b/gfx/gdi_util.h
diff --git a/gfx/gfx.gyp b/gfx/gfx.gyp
index 0aabe26..8a33525 100644
--- a/gfx/gfx.gyp
+++ b/gfx/gfx.gyp
@@ -19,9 +19,11 @@
       'sources': [
         'codec/jpeg_codec_unittest.cc',
         'codec/png_codec_unittest.cc',
+        'color_utils_unittest.cc',
         'insets_unittest.cc',
         'rect_unittest.cc',
         'run_all_unittests.cc',
+        'skbitmap_operations_unittest.cc',
         'test_suite.h',
       ],
       'include_dirs': [
@@ -31,6 +33,7 @@
         ['OS=="win"', {
           'sources': [
             'icon_util_unittest.cc',
+            'native_theme_win_unittest.cc',
           ],
         }],
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
@@ -62,12 +65,14 @@
         'codec/jpeg_codec.h',
         'codec/png_codec.cc',
         'codec/png_codec.h',
+        'color_utils.cc',
+        'color_utils.h',
+        'favicon_size.h',
         'gfx_paths.cc',
         'gfx_paths.h',
         'insets.cc',
         'insets.h',
         'native_widget_types.h',
-        'native_widget_types_gtk.cc',
         'path.cc',
         'path.h',
         'path_gtk.cc',
@@ -80,12 +85,22 @@
         'scrollbar_size.h',
         'size.cc',
         'size.h',
+        'skbitmap_operations.cc',
+        'skbitmap_operations.h',
+        'skia_util.cc',
+        'skia_util.h',
+        'skia_utils_gtk.cc',
+        'skia_utils_gtk.h',
       ],
       'conditions': [
         ['OS=="win"', {
           'sources': [
+            'gdi_util.cc',
+            'gdi_util.h',
             'icon_util.cc',
             'icon_util.h',
+            'native_theme_win.cc',
+            'native_theme_win.h',
           ],
         }],
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
@@ -94,6 +109,7 @@
             'gtk_native_view_id_manager.h',
             'gtk_util.cc',
             'gtk_util.h',
+            'native_widget_types_gtk.cc',
           ],
         }],
       ],
diff --git a/app/gfx/native_theme_win.cc b/gfx/native_theme_win.cc
index 9c60ef9..87024d3 100644
--- a/app/gfx/native_theme_win.cc
+++ b/gfx/native_theme_win.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/native_theme_win.h"
+#include "gfx/native_theme_win.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
-#include "app/gfx/gdi_util.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
+#include "gfx/gdi_util.h"
 #include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/skia_utils_win.h"
diff --git a/app/gfx/native_theme_win.h b/gfx/native_theme_win.h
index 504ce46..504ce46 100644
--- a/app/gfx/native_theme_win.h
+++ b/gfx/native_theme_win.h
diff --git a/app/gfx/native_theme_win_unittest.cc b/gfx/native_theme_win_unittest.cc
index fea87eab..b087da6 100644
--- a/app/gfx/native_theme_win_unittest.cc
+++ b/gfx/native_theme_win_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/native_theme_win.h"
+#include "gfx/native_theme_win.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/app/gfx/skbitmap_operations.cc b/gfx/skbitmap_operations.cc
index 7108597..5ce8ebd 100644
--- a/app/gfx/skbitmap_operations.cc
+++ b/gfx/skbitmap_operations.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/skbitmap_operations.h"
+#include "gfx/skbitmap_operations.h"
 
 #include <algorithm>
 
diff --git a/app/gfx/skbitmap_operations.h b/gfx/skbitmap_operations.h
index 57a2301..71f6473 100644
--- a/app/gfx/skbitmap_operations.h
+++ b/gfx/skbitmap_operations.h
@@ -5,7 +5,7 @@
 #ifndef APP_GFX_SKBITMAP_OPERATIONS_H_
 #define APP_GFX_SKBITMAP_OPERATIONS_H_
 
-#include "app/gfx/color_utils.h"
+#include "gfx/color_utils.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class SkBitmap;
diff --git a/app/gfx/skbitmap_operations_unittest.cc b/gfx/skbitmap_operations_unittest.cc
index 7a68fe3..4082b22 100644
--- a/app/gfx/skbitmap_operations_unittest.cc
+++ b/gfx/skbitmap_operations_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/skbitmap_operations.h"
+#include "gfx/skbitmap_operations.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/app/gfx/skia_util.cc b/gfx/skia_util.cc
index f5f03b8..13ef4d9 100644
--- a/app/gfx/skia_util.cc
+++ b/gfx/skia_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/skia_util.h"
+#include "gfx/skia_util.h"
 
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
diff --git a/app/gfx/skia_util.h b/gfx/skia_util.h
index 66a8aeb..66a8aeb 100644
--- a/app/gfx/skia_util.h
+++ b/gfx/skia_util.h
diff --git a/app/gfx/skia_utils_gtk.cc b/gfx/skia_utils_gtk.cc
index 3937d46..8ed4bec 100644
--- a/app/gfx/skia_utils_gtk.cc
+++ b/gfx/skia_utils_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/gfx/skia_utils_gtk.h"
+#include "gfx/skia_utils_gtk.h"
 
 #include <gdk/gdkcolor.h>
 
diff --git a/app/gfx/skia_utils_gtk.h b/gfx/skia_utils_gtk.h
index df68581..df68581 100644
--- a/app/gfx/skia_utils_gtk.h
+++ b/gfx/skia_utils_gtk.h
diff --git a/printing/emf_win.cc b/printing/emf_win.cc
index c6a4319..d8e03af 100644
--- a/printing/emf_win.cc
+++ b/printing/emf_win.cc
@@ -4,13 +4,13 @@
 
 #include "printing/emf_win.h"
 
-#include "app/gfx/gdi_util.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "gfx/codec/jpeg_codec.h"
 #include "gfx/codec/png_codec.h"
+#include "gfx/gdi_util.h"
 #include "gfx/rect.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/printing/image.cc b/printing/image.cc
index 042ebf0..dbee79d 100644
--- a/printing/image.cc
+++ b/printing/image.cc
@@ -12,7 +12,7 @@
 #include "skia/ext/platform_device.h"
 
 #if defined(OS_WIN)
-#include "app/gfx/gdi_util.h"  // EMF support
+#include "gfx/gdi_util.h"  // EMF support
 #elif defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #include "base/scoped_cftyperef.h"
diff --git a/views/background.cc b/views/background.cc
index 333b011..744aad9 100644
--- a/views/background.cc
+++ b/views/background.cc
@@ -5,8 +5,8 @@
 #include "views/background.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "base/logging.h"
+#include "gfx/color_utils.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "views/painter.h"
diff --git a/views/controls/button/image_button.cc b/views/controls/button/image_button.cc
index 636a8fd..e12dab2 100644
--- a/views/controls/button/image_button.cc
+++ b/views/controls/button/image_button.cc
@@ -5,8 +5,8 @@
 #include "views/controls/button/image_button.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/skbitmap_operations.h"
 #include "app/throb_animation.h"
+#include "gfx/skbitmap_operations.h"
 
 namespace views {
 
diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc
index ccee133..69ca8a3 100644
--- a/views/controls/combobox/native_combobox_win.cc
+++ b/views/controls/combobox/native_combobox_win.cc
@@ -6,9 +6,9 @@
 
 #include "app/combobox_model.h"
 #include "app/gfx/font.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "gfx/native_theme_win.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/widget/widget.h"
 
diff --git a/views/controls/label.cc b/views/controls/label.cc
index 3a93822..4ba457b 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -8,13 +8,13 @@
 #include <limits>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "app/gfx/font.h"
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/color_utils.h"
 #include "gfx/insets.h"
 #include "views/background.h"
 
diff --git a/views/controls/link.cc b/views/controls/link.cc
index 80172e2..72d5c29 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -8,10 +8,10 @@
 #include <gdk/gdk.h>
 #endif
 
-#include "app/gfx/color_utils.h"
 #include "app/gfx/font.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
+#include "gfx/color_utils.h"
 #include "views/event.h"
 
 namespace {
diff --git a/views/controls/menu/menu_config_win.cc b/views/controls/menu/menu_config_win.cc
index f242f8c..155f86a 100644
--- a/views/controls/menu/menu_config_win.cc
+++ b/views/controls/menu/menu_config_win.cc
@@ -8,10 +8,10 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "app/gfx/native_theme_win.h"
-#include "base/logging.h"
 #include "app/l10n_util_win.h"
+#include "base/logging.h"
 #include "base/win_util.h"
+#include "gfx/native_theme_win.h"
 
 using gfx::NativeTheme;
 
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc
index 33e5ff4..1e8745a 100644
--- a/views/controls/menu/menu_item_view_gtk.cc
+++ b/views/controls/menu/menu_item_view_gtk.cc
@@ -5,8 +5,8 @@
 #include "views/controls/menu/menu_item_view.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/favicon_size.h"
 #include "app/resource_bundle.h"
+#include "gfx/favicon_size.h"
 #include "grit/app_resources.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_config.h"
diff --git a/views/controls/menu/menu_item_view_win.cc b/views/controls/menu/menu_item_view_win.cc
index a2f31fb..f3b8123 100644
--- a/views/controls/menu/menu_item_view_win.cc
+++ b/views/controls/menu/menu_item_view_win.cc
@@ -9,8 +9,8 @@
 #include <Vssym32.h>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
+#include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/submenu_view.h"
diff --git a/views/controls/menu/menu_scroll_view_container.cc b/views/controls/menu/menu_scroll_view_container.cc
index 25817e4..df6e835 100644
--- a/views/controls/menu/menu_scroll_view_container.cc
+++ b/views/controls/menu/menu_scroll_view_container.cc
@@ -11,7 +11,7 @@
 #endif
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
+#include "gfx/color_utils.h"
 #include "views/border.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
@@ -19,7 +19,7 @@
 #include "views/controls/menu/submenu_view.h"
 
 #if defined(OS_WIN)
-#include "app/gfx/native_theme_win.h"
+#include "gfx/native_theme_win.h"
 #endif
 
 #if defined(OS_WIN)
diff --git a/views/controls/menu/menu_separator_win.cc b/views/controls/menu/menu_separator_win.cc
index 7273a0a..fdca5e3 100644
--- a/views/controls/menu/menu_separator_win.cc
+++ b/views/controls/menu/menu_separator_win.cc
@@ -9,7 +9,7 @@
 #include <Vssym32.h>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/native_theme_win.h"
+#include "gfx/native_theme_win.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_item_view.h"
 
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index f6b1d75..347406f 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -10,11 +10,11 @@
 #include <atlframe.h>
 #include <atlmisc.h>
 
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util_win.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/win_util.h"
+#include "gfx/native_theme_win.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/native/native_view_host.h"
diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc
index 053c16d..3ef04ab 100644
--- a/views/controls/progress_bar.cc
+++ b/views/controls/progress_bar.cc
@@ -7,12 +7,13 @@
 #include <string>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/color_utils.h"
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "gfx/color_utils.h"
+#include "gfx/insets.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "views/background.h"
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index 0d20c03..dfe1e29 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
@@ -8,11 +8,11 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
-#include "app/gfx/skia_utils_gtk.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/skia_utils_gtk.h"
 #include "views/background.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/fill_layout.h"
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index 48df2e8..a835e05 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -8,11 +8,11 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
+#include "gfx/native_theme_win.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/fill_layout.h"
 #include "views/widget/root_view.h"
diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index e683553..e030dbf 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -8,12 +8,12 @@
 #include <windowsx.h>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/table_model.h"
 #include "base/logging.h"
 #include "base/win_util.h"
+#include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "skia/ext/skia_utils_win.h"
 #include "views/controls/table/table_view2.h"
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index f944d22..6122e44 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -10,7 +10,6 @@
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/favicon_size.h"
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
@@ -18,6 +17,7 @@
 #include "app/table_model.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
+#include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index 6f3d3ca..5580786 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -6,11 +6,11 @@
 
 #include "views/controls/textfield/native_textfield_gtk.h"
 
-#include "app/gfx/skia_utils_gtk.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/gtk_util.h"
 #include "gfx/insets.h"
+#include "gfx/skia_utils_gtk.h"
 #include "views/controls/textfield/textfield.h"
 
 namespace views {
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index bdf9eec..a405430 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -8,13 +8,13 @@
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win_util.h"
 #include "base/keyboard_codes.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
+#include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "views/controls/menu/menu_win.h"
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index cb733d8..7cf1e8f 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -8,13 +8,13 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/canvas_paint.h"
-#include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
 #include "base/win_util.h"
+#include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "gfx/point.h"
 #include "grit/app_resources.h"
diff --git a/views/drag_utils_win.cc b/views/drag_utils_win.cc
index c2d4bed..0c559a7 100644
--- a/views/drag_utils_win.cc
+++ b/views/drag_utils_win.cc
@@ -9,9 +9,9 @@
 #include <shobjidl.h>
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/gdi_util.h"
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_win.h"
+#include "gfx/gdi_util.h"
 
 namespace drag_utils {
 
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index a1be5ee..1f574e2 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -5,12 +5,12 @@
 #include "views/widget/widget_win.h"
 
 #include "app/gfx/canvas.h"
-#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util_win.h"
 #include "app/system_monitor.h"
 #include "app/win_util.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
+#include "gfx/native_theme_win.h"
 #include "gfx/path.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/controls/native_control_win.h"
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index f54ae32..13ecc8c 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -16,7 +16,6 @@
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
-#include "app/gfx/skia_utils_gtk.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/keyboard_codes.h"
@@ -25,9 +24,11 @@
 #include "views/standard_layout.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
+
 #if defined(OS_WIN)
-#include "app/gfx/native_theme_win.h"
+#include "gfx/native_theme_win.h"
 #else
+#include "gfx/skia_utils_gtk.h"
 #include "views/window/hit_test.h"
 #include "views/widget/widget.h"
 #endif
diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc
index 9248296..7dfe41e 100644
--- a/webkit/glue/webcursor_win.cc
+++ b/webkit/glue/webcursor_win.cc
@@ -2,9 +2,9 @@
 // source code is governed by a BSD-style license that can be found in the
 // LICENSE file.
 
-#include "app/gfx/gdi_util.h"
 #include "base/logging.h"
 #include "base/pickle.h"
+#include "gfx/gdi_util.h"
 #include "grit/webkit_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
diff --git a/webkit/glue/webthemeengine_impl_win.cc b/webkit/glue/webthemeengine_impl_win.cc
index 86ff202..78d7cf3614 100644
--- a/webkit/glue/webthemeengine_impl_win.cc
+++ b/webkit/glue/webthemeengine_impl_win.cc
@@ -4,7 +4,7 @@
 
 #include "webkit/glue/webthemeengine_impl_win.h"
 
-#include "app/gfx/native_theme_win.h"
+#include "gfx/native_theme_win.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
diff --git a/webkit/tools/test_shell/test_shell_platform_delegate_win.cc b/webkit/tools/test_shell/test_shell_platform_delegate_win.cc
index 7fbd0b0..2c7510d 100644
--- a/webkit/tools/test_shell/test_shell_platform_delegate_win.cc
+++ b/webkit/tools/test_shell/test_shell_platform_delegate_win.cc
@@ -7,11 +7,11 @@
 #include <windows.h>
 #include <commctrl.h>
 
-#include "app/gfx/native_theme_win.h"
 #include "base/command_line.h"
 #include "base/event_recorder.h"
 #include "base/resource_util.h"
 #include "base/win_util.h"
+#include "gfx/native_theme_win.h"
 #include "webkit/tools/test_shell/foreground_helper.h"
 #include "webkit/tools/test_shell/test_shell.h"
 #include "webkit/tools/test_shell/test_shell_platform_delegate.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index b785844..3d1acb7b 100644
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -12,11 +12,11 @@
 #include <shlobj.h>
 #include <shlwapi.h>
 
-#include "app/gfx/gdi_util.h"
 #include "base/message_loop.h"
 #include "base/trace_event.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/native_widget_types.h"
+#include "gfx/gdi_util.h"
 #include "gfx/point.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"