Move classes depending on Skia out of base/gfx and into app/gfx. Rename

native_theme to native_theme_win since its Windows-specific.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/259047

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

97 files changed, 170 insertions, 148 deletions

diff --git a/app/app.gyp b/app/app.gyp
index 1ae1335..c35ba0e 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -81,6 +81,8 @@
         'drag_drop_types_gtk.cc',
         'drag_drop_types_win.cc',
         'drag_drop_types.h',
+        'gfx/blit.cc',
+        'gfx/blit.h',
         'gfx/canvas.cc',
         'gfx/canvas.h',
         'gfx/canvas_linux.cc',
@@ -98,9 +100,15 @@
         'gfx/color_utils.cc',
         'gfx/color_utils.h',
         'gfx/favicon_size.h',
+        'gfx/gdi_util.cc',
+        'gfx/gdi_util.h',
+        'gfx/gtk_util.cc',
+        'gfx/gtk_util.h',
         'gfx/icon_util.cc',
         'gfx/icon_util.h',
         'gfx/insets.h',
+        'gfx/native_theme_win.cc',
+        'gfx/native_theme_win.h',
         'gfx/path_gtk.cc',
         'gfx/path_win.cc',
         'gfx/path.h',
@@ -190,13 +198,19 @@
         ['OS!="win"', {
           'sources!': [
             'drag_drop_types.h',
+            'gfx/gdi_util.cc',
+            'gfx/gdi_util.h',
             'gfx/icon_util.cc',
             'gfx/icon_util.h',
+            'gfx/native_theme_win.cc',
+            'gfx/native_theme_win.h',
             'os_exchange_data.cc',
           ],
         }],
         ['OS!="linux"', {
           'sources!': [
+            'gfx/gtk_util.cc',
+            'gfx/gtk_util.h',
             'gtk_dnd_util.cc',
             'gtk_dnd_util.h',
           ],
@@ -228,6 +242,7 @@
         'gfx/color_utils_unittest.cc',
         'gfx/font_unittest.cc',
         'gfx/icon_util_unittest.cc',
+        'gfx/native_theme_win_unittest.cc',
         'gfx/skbitmap_operations_unittest.cc',
         'gfx/text_elider_unittest.cc',
         'l10n_util_mac_unittest.mm',
@@ -254,6 +269,7 @@
         ['OS!="win"', {
           'sources!': [
             'gfx/icon_util_unittest.cc',
+            'gfx/native_theme_win_unittest.cc',
             'os_exchange_data_win_unittest.cc',
             'win_util_unittest.cc',
           ],
diff --git a/base/gfx/blit.cc b/app/gfx/blit.cc
index 4b94255..359e142 100644
--- a/base/gfx/blit.cc
+++ b/app/gfx/blit.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 "base/gfx/blit.h"
+#include "app/gfx/blit.h"
 
 #if defined(OS_LINUX)
 #include <cairo/cairo.h>
diff --git a/base/gfx/blit.h b/app/gfx/blit.h
index 25f7a5e..f2460ca 100644
--- a/base/gfx/blit.h
+++ b/app/gfx/blit.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_GFX_BLIT_H_
-#define BASE_GFX_BLIT_H_
+#ifndef APP_GFX_BLIT_H_
+#define APP_GFX_BLIT_H_
 
 #include "base/gfx/native_widget_types.h"
 #include "base/gfx/point.h"
@@ -44,4 +44,4 @@ void BlitCanvasToCanvas(skia::PlatformCanvas *dst_canvas,
 
 }  // namespace gfx
 
-#endif  // BASE_GFX_BLIT_H_
+#endif  // APP_GFX_BLIT_H_
diff --git a/base/gfx/gdi_util.cc b/app/gfx/gdi_util.cc
index 152698f..2711280 100644
--- a/base/gfx/gdi_util.cc
+++ b/app/gfx/gdi_util.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "base/gfx/gdi_util.h"
+#include "app/gfx/gdi_util.h"
 
 namespace gfx {
 
diff --git a/base/gfx/gdi_util.h b/app/gfx/gdi_util.h
index cc15e92..c458d9f 100644
--- a/base/gfx/gdi_util.h
+++ b/app/gfx/gdi_util.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
-#ifndef BASE_GFX_GDI_UTIL_H__
-#define BASE_GFX_GDI_UTIL_H__
+#ifndef APP_GFX_GDI_UTIL_H_
+#define APP_GFX_GDI_UTIL_H_
 
 #include <vector>
 #include <windows.h>
@@ -33,4 +33,4 @@ void SubtractRectanglesFromRegion(HRGN hrgn,
 
 }  // namespace gfx
 
-#endif // BASE_GFX_GDI_UTIL_H__
+#endif // APP_GFX_GDI_UTIL_H_
diff --git a/base/gfx/gtk_util.cc b/app/gfx/gtk_util.cc
index 1611c94..03d0504 100644
--- a/base/gfx/gtk_util.cc
+++ b/app/gfx/gtk_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 "base/gfx/gtk_util.h"
+#include "app/gfx/gtk_util.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
diff --git a/base/gfx/gtk_util.h b/app/gfx/gtk_util.h
index 523f7bf..523f7bf 100644
--- a/base/gfx/gtk_util.h
+++ b/app/gfx/gtk_util.h
diff --git a/base/gfx/native_theme.cc b/app/gfx/native_theme_win.cc
index 75bf67b..594042b 100644
--- a/base/gfx/native_theme.cc
+++ b/app/gfx/native_theme_win.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "base/gfx/native_theme.h"
+#include "app/gfx/native_theme_win.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
-#include "base/gfx/gdi_util.h"
+#include "app/gfx/gdi_util.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
diff --git a/base/gfx/native_theme.h b/app/gfx/native_theme_win.h
index 4516cba..62415b4 100644
--- a/base/gfx/native_theme.h
+++ b/app/gfx/native_theme_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 //
@@ -8,8 +8,8 @@
 // For more information on visual style parts and states, see:
 // http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/commctls/userex/topics/partsandstates.asp
 
-#ifndef BASE_GFX_NATIVE_THEME_H__
-#define BASE_GFX_NATIVE_THEME_H__
+#ifndef APP_GFX_NATIVE_THEME_WIN_H_
+#define APP_GFX_NATIVE_THEME_WIN_H_
 
 #include <windows.h>
 #include <uxtheme.h>
@@ -288,9 +288,9 @@ class NativeTheme {
   // A cache of open theme handles.
   mutable HANDLE theme_handles_[LAST];
 
-  DISALLOW_EVIL_CONSTRUCTORS(NativeTheme);
+  DISALLOW_COPY_AND_ASSIGN(NativeTheme);
 };
 
 }  // namespace gfx
 
-#endif  // BASE_GFX_NATIVE_THEME_H__
+#endif  // APP_GFX_NATIVE_THEME_WIN_H_
diff --git a/base/gfx/native_theme_unittest.cc b/app/gfx/native_theme_win_unittest.cc
index 257e031..fea87eab 100644
--- a/base/gfx/native_theme_unittest.cc
+++ b/app/gfx/native_theme_win_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "base/gfx/native_theme.h"
+#include "app/gfx/native_theme_win.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc
index 85f00c6..911cc03 100644
--- a/app/resource_bundle_linux.cc
+++ b/app/resource_bundle_linux.cc
@@ -8,12 +8,12 @@
 
 #include "app/app_paths.h"
 #include "app/gfx/font.h"
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/base_paths.h"
 #include "base/data_pack.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_piece.h"
diff --git a/app/win_util.cc b/app/win_util.cc
index 0e985ce..b3b66c2 100644
--- a/app/win_util.cc
+++ b/app/win_util.cc
@@ -13,12 +13,12 @@
 #include <algorithm>
 
 #include "app/gfx/codec/png_codec.h"
+#include "app/gfx/gdi_util.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/gfx/gdi_util.h"
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "base/registry.h"
diff --git a/base/base.gyp b/base/base.gyp
index 2f0e9da..41108dd 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -518,16 +518,8 @@
       'type': '<(library)',
       'msvs_guid': 'A508ADD3-CECE-4E0F-8448-2F5E454DF551',
       'sources': [
-        'gfx/blit.cc',
-        'gfx/blit.h',
-        'gfx/gdi_util.cc',
-        'gfx/gdi_util.h',
         'gfx/gtk_native_view_id_manager.cc',
         'gfx/gtk_native_view_id_manager.h',
-        'gfx/gtk_util.cc',
-        'gfx/gtk_util.h',
-        'gfx/native_theme.cc',
-        'gfx/native_theme.h',
         'gfx/native_widget_types.h',
         'gfx/native_widget_types_gtk.cc',
         'gfx/point.cc',
@@ -542,7 +534,6 @@
       ],
       'dependencies': [
         'base',
-        '../skia/skia.gyp:skia',
       ],
       'export_dependent_settings': [
         'base',
@@ -553,14 +544,8 @@
             '../build/linux/system.gyp:gtk',
           ],
         }],
-        [ 'OS != "win"', { 'sources!': [
-            'gfx/gdi_util.cc',
-            'gfx/native_theme.cc',
-            ],
-        }],
         [ 'OS != "linux" and OS != "freebsd"', { 'sources!': [
             'gfx/gtk_native_view_id_manager.cc',
-            'gfx/gtk_util.cc',
             'gfx/native_widget_types_gtk.cc',
             ],
         }],
@@ -592,7 +577,6 @@
         'file_path_unittest.cc',
         'file_util_unittest.cc',
         'file_version_info_unittest.cc',
-        'gfx/native_theme_unittest.cc',
         'gfx/rect_unittest.cc',
         'gmock_unittest.cc',
         'histogram_unittest.cc',
@@ -663,7 +647,6 @@
       'dependencies': [
         'base',
         'base_gfx',
-        '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
diff --git a/base/gfx/DEPS b/base/gfx/DEPS
deleted file mode 100644
index 2a3980b..0000000
--- a/base/gfx/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+skia",
-]
diff --git a/base/gfx/platform_canvas.h b/base/gfx/platform_canvas.h
deleted file mode 100644
index e69de29..0000000
--- a/base/gfx/platform_canvas.h
+++ /dev/null
diff --git a/base/gfx/platform_canvas_linux.h b/base/gfx/platform_canvas_linux.h
deleted file mode 100644
index e69de29..0000000
--- a/base/gfx/platform_canvas_linux.h
+++ /dev/null
diff --git a/base/gfx/platform_canvas_mac.h b/base/gfx/platform_canvas_mac.h
deleted file mode 100644
index e69de29..0000000
--- a/base/gfx/platform_canvas_mac.h
+++ /dev/null
diff --git a/base/gfx/platform_device_linux.h b/base/gfx/platform_device_linux.h
deleted file mode 100644
index e69de29..0000000
--- a/base/gfx/platform_device_linux.h
+++ /dev/null
diff --git a/base/gfx/platform_device_mac.h b/base/gfx/platform_device_mac.h
deleted file mode 100644
index e69de29..0000000
--- a/base/gfx/platform_device_mac.h
+++ /dev/null
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index 6dfb45d..5bc33ef 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -10,8 +10,8 @@
 #include <algorithm>
 
 #include "app/gfx/font.h"
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
-#include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
index a49055e..78d8708 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
@@ -9,10 +9,10 @@
 #include <algorithm>
 
 #include "app/gfx/font.h"
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
-#include "base/gfx/gtk_util.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/string_util.h"
diff --git a/chrome/browser/browser_theme_provider_gtk.cc b/chrome/browser/browser_theme_provider_gtk.cc
index ac04e65..d551662 100644
--- a/chrome/browser/browser_theme_provider_gtk.cc
+++ b/chrome/browser/browser_theme_provider_gtk.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/browser_theme_provider.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
-#include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
diff --git a/chrome/browser/gtk/about_chrome_dialog.cc b/chrome/browser/gtk/about_chrome_dialog.cc
index 0a12d34..a2bb512 100644
--- a/chrome/browser/gtk/about_chrome_dialog.cc
+++ b/chrome/browser/gtk/about_chrome_dialog.cc
@@ -6,10 +6,10 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/gtk/blocked_popup_container_view_gtk.cc b/chrome/browser/gtk/blocked_popup_container_view_gtk.cc
index fa3979e..ad1eb4d 100644
--- a/chrome/browser/gtk/blocked_popup_container_view_gtk.cc
+++ b/chrome/browser/gtk/blocked_popup_container_view_gtk.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/gtk/blocked_popup_container_view_gtk.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
-#include "base/gfx/gtk_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc
index 33fa70e..c7cb635 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bar_gtk.cc
@@ -6,12 +6,12 @@
 
 #include <vector>
 
+#include "app/gfx/gtk_util.h"
 #include "app/gfx/canvas_paint.h"
 #include "app/gfx/text_elider.h"
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/gtk_util.h"
 #include "base/pickle.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.cc b/chrome/browser/gtk/bookmark_bubble_gtk.cc
index 94ef5ac..3c71a9c 100644
--- a/chrome/browser/gtk/bookmark_bubble_gtk.cc
+++ b/chrome/browser/gtk/bookmark_bubble_gtk.cc
@@ -6,10 +6,10 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
-#include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc
index 1ff0197..17bd8d1 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk.cc
+++ b/chrome/browser/gtk/bookmark_editor_gtk.cc
@@ -6,9 +6,9 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
-#include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/gtk/bookmark_tree_model.h"
diff --git a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc
index 7f8a7e6..b16fad3 100644
--- a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc
@@ -6,10 +6,10 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/gtk_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/gtk/bookmark_context_menu.h"
diff --git a/chrome/browser/gtk/bookmark_utils_gtk.cc b/chrome/browser/gtk/bookmark_utils_gtk.cc
index 16d1c7f..0bd80a3 100644
--- a/chrome/browser/gtk/bookmark_utils_gtk.cc
+++ b/chrome/browser/gtk/bookmark_utils_gtk.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/browser/gtk/bookmark_utils_gtk.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/gtk_util.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc
index 791b1f3..5f5bc5c 100644
--- a/chrome/browser/gtk/browser_titlebar.cc
+++ b/chrome/browser/gtk/browser_titlebar.cc
@@ -10,10 +10,10 @@
 #include <string>
 #include <vector>
 
+#include "app/gfx/gtk_util.h"
 #include "app/gfx/skbitmap_operations.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/encoding_menu_controller.h"
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc
index b629b24..f2bba91 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.cc
+++ b/chrome/browser/gtk/browser_toolbar_gtk.cc
@@ -7,11 +7,11 @@
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/base_paths_linux.h"
-#include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 7013294..0f54c18 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -10,12 +10,12 @@
 #include <string>
 
 #include "app/gfx/color_utils.h"
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/base_paths_linux.h"
 #include "base/command_line.h"
-#include "base/gfx/gtk_util.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
diff --git a/chrome/browser/gtk/custom_button.cc b/chrome/browser/gtk/custom_button.cc
index 3e4e1cf..e21e62d 100644
--- a/chrome/browser/gtk/custom_button.cc
+++ b/chrome/browser/gtk/custom_button.cc
@@ -4,12 +4,12 @@
 
 #include "chrome/browser/gtk/custom_button.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/gfx/skbitmap_operations.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/basictypes.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
diff --git a/chrome/browser/gtk/download_shelf_gtk.cc b/chrome/browser/gtk/download_shelf_gtk.cc
index 5ced45d..7820097 100644
--- a/chrome/browser/gtk/download_shelf_gtk.cc
+++ b/chrome/browser/gtk/download_shelf_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/gtk/download_shelf_gtk.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_util.h"
diff --git a/chrome/browser/gtk/extension_install_prompt_gtk.cc b/chrome/browser/gtk/extension_install_prompt_gtk.cc
index 28f4c56..943cb0e 100644
--- a/chrome/browser/gtk/extension_install_prompt_gtk.cc
+++ b/chrome/browser/gtk/extension_install_prompt_gtk.cc
@@ -4,8 +4,8 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
-#include "base/gfx/gtk_util.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_list.h"
diff --git a/chrome/browser/gtk/extension_shelf_gtk.cc b/chrome/browser/gtk/extension_shelf_gtk.cc
index 437f91f..112a214 100644
--- a/chrome/browser/gtk/extension_shelf_gtk.cc
+++ b/chrome/browser/gtk/extension_shelf_gtk.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/gtk/extension_shelf_gtk.h"
 
-#include "base/gfx/gtk_util.h"
+#include "app/gfx/gtk_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc
index f3378c3..5ff2606 100644
--- a/chrome/browser/gtk/find_bar_gtk.cc
+++ b/chrome/browser/gtk/find_bar_gtk.cc
@@ -6,8 +6,8 @@
 
 #include <gdk/gdkkeysyms.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
-#include "base/gfx/gtk_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/gtk/first_run_bubble.cc b/chrome/browser/gtk/first_run_bubble.cc
index 1d90194..4711c6f 100644
--- a/chrome/browser/gtk/first_run_bubble.cc
+++ b/chrome/browser/gtk/first_run_bubble.cc
@@ -6,8 +6,8 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/search_engines/template_url_model.h"
diff --git a/chrome/browser/gtk/gtk_chrome_button.cc b/chrome/browser/gtk/gtk_chrome_button.cc
index 01d6db7..309c4a8 100644
--- a/chrome/browser/gtk/gtk_chrome_button.cc
+++ b/chrome/browser/gtk/gtk_chrome_button.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 
+#include "app/gfx/gtk_util.h"
 #include "base/basictypes.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/browser/gtk/nine_box.h"
 
 #include "grit/app_resources.h"
diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc
index 296b72c..63dccfd 100644
--- a/chrome/browser/gtk/gtk_theme_provider.cc
+++ b/chrome/browser/gtk/gtk_theme_provider.cc
@@ -7,7 +7,7 @@
 #include <gtk/gtk.h>
 
 #include "app/gfx/color_utils.h"
-#include "base/gfx/gtk_util.h"
+#include "app/gfx/gtk_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/gtk/cairo_cached_surface.h"
diff --git a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
index 8c67ab4..75f7bca 100644
--- a/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
+++ b/chrome/browser/gtk/hung_renderer_dialog_gtk.cc
@@ -6,9 +6,9 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/gtk_util.h"
 #include "base/process_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/gtk/info_bubble_gtk.cc b/chrome/browser/gtk/info_bubble_gtk.cc
index 2e6adb6..b889628 100644
--- a/chrome/browser/gtk/info_bubble_gtk.cc
+++ b/chrome/browser/gtk/info_bubble_gtk.cc
@@ -7,10 +7,10 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
-#include "base/gfx/gtk_util.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
diff --git a/chrome/browser/gtk/infobar_gtk.cc b/chrome/browser/gtk/infobar_gtk.cc
index 52d9844..1f95e93 100644
--- a/chrome/browser/gtk/infobar_gtk.cc
+++ b/chrome/browser/gtk/infobar_gtk.cc
@@ -6,7 +6,7 @@
 
 #include <gtk/gtk.h>
 
-#include "base/gfx/gtk_util.h"
+#include "app/gfx/gtk_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
diff --git a/chrome/browser/gtk/keyword_editor_view.cc b/chrome/browser/gtk/keyword_editor_view.cc
index 5021fc1..028de54 100644
--- a/chrome/browser/gtk/keyword_editor_view.cc
+++ b/chrome/browser/gtk/keyword_editor_view.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/gtk/keyword_editor_view.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/browser/gtk/edit_search_engine_dialog.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/metrics/user_metrics.h"
diff --git a/chrome/browser/gtk/list_store_favicon_loader.cc b/chrome/browser/gtk/list_store_favicon_loader.cc
index eb1e327..f0a146b 100644
--- a/chrome/browser/gtk/list_store_favicon_loader.cc
+++ b/chrome/browser/gtk/list_store_favicon_loader.cc
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "app/gfx/codec/png_codec.h"
-#include "base/gfx/gtk_util.h"
+#include "app/gfx/gtk_util.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/profile.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc
index d1761e6..a728022 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/gtk/location_bar_view_gtk.cc
@@ -6,10 +6,10 @@
 
 #include <string>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
-#include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc
index e166030..7ae146f 100644
--- a/chrome/browser/gtk/menu_gtk.cc
+++ b/chrome/browser/gtk/menu_gtk.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/gtk/menu_gtk.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
-#include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
diff --git a/chrome/browser/gtk/nine_box.cc b/chrome/browser/gtk/nine_box.cc
index 6f6d77f..369c40e 100644
--- a/chrome/browser/gtk/nine_box.cc
+++ b/chrome/browser/gtk/nine_box.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/browser/gtk/nine_box.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/basictypes.h"
-#include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "base/logging.h"
 
diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc
index afc1ca8..4f1ae36 100644
--- a/chrome/browser/gtk/options/content_page_gtk.cc
+++ b/chrome/browser/gtk/options/content_page_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/gtk/options/content_page_gtk.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
diff --git a/chrome/browser/gtk/options/cookies_view.cc b/chrome/browser/gtk/options/cookies_view.cc
index bfe1590..1cface4 100644
--- a/chrome/browser/gtk/options/cookies_view.cc
+++ b/chrome/browser/gtk/options/cookies_view.cc
@@ -7,8 +7,8 @@
 #include <set>
 #include <string>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
-#include "base/gfx/gtk_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/time_format.h"
diff --git a/chrome/browser/gtk/options/exceptions_page_gtk.cc b/chrome/browser/gtk/options/exceptions_page_gtk.cc
index bcebb90..164a821 100644
--- a/chrome/browser/gtk/options/exceptions_page_gtk.cc
+++ b/chrome/browser/gtk/options/exceptions_page_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/gtk/options/exceptions_page_gtk.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/common/gtk_tree.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/gtk/options/passwords_page_gtk.cc b/chrome/browser/gtk/options/passwords_page_gtk.cc
index cab4fe2..8b2203b 100644
--- a/chrome/browser/gtk/options/passwords_page_gtk.cc
+++ b/chrome/browser/gtk/options/passwords_page_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/gtk/options/passwords_page_gtk.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/common/gtk_tree.h"
 #include "chrome/common/gtk_util.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
index 4743bc5..2a9d712 100644
--- a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
+++ b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc
@@ -4,9 +4,9 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/possible_url_model.h"
diff --git a/chrome/browser/gtk/status_bubble_gtk.cc b/chrome/browser/gtk/status_bubble_gtk.cc
index 80cfaa5..5ee330d 100644
--- a/chrome/browser/gtk/status_bubble_gtk.cc
+++ b/chrome/browser/gtk/status_bubble_gtk.cc
@@ -6,9 +6,9 @@
 
 #include <gtk/gtk.h>
 
+#include "app/gfx/gtk_util.h"
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
-#include "base/gfx/gtk_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc
index 5809cd1..1764578 100644
--- a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc
+++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc
@@ -9,8 +9,8 @@
 #include <algorithm>
 
 #include "app/gfx/canvas_paint.h"
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
-#include "base/gfx/gtk_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
index 5838633..4c742ab 100644
--- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
@@ -8,10 +8,10 @@
 
 #include "app/gtk_dnd_util.h"
 #include "app/gfx/canvas_paint.h"
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
-#include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
diff --git a/chrome/browser/gtk/task_manager_gtk.cc b/chrome/browser/gtk/task_manager_gtk.cc
index f9095d0..39fc6ab 100644
--- a/chrome/browser/gtk/task_manager_gtk.cc
+++ b/chrome/browser/gtk/task_manager_gtk.cc
@@ -9,9 +9,9 @@
 #include <algorithm>
 #include <vector>
 
+#include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index 6b86e83..2eaba30 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -2,9 +2,9 @@
 // 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/gfx/gdi_util.h"
 #include "base/simple_thread.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/renderer_host/backing_store_win.cc b/chrome/browser/renderer_host/backing_store_win.cc
index ef09f89..3f27161 100644
--- a/chrome/browser/renderer_host/backing_store_win.cc
+++ b/chrome/browser/renderer_host/backing_store_win.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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/renderer_host/backing_store.h"
 
+#include "app/gfx/gdi_util.h"
 #include "base/command_line.h"
-#include "base/gfx/gdi_util.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/transport_dib.h"
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index 01ee015..c1ddaef 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -21,11 +21,6 @@
 #include "views/view.h"
 #endif
 
-#if defined(OS_WIN)
-#include "base/gfx/gdi_util.h"
-#include "chrome/app/chrome_dll_resource.h"
-#endif  // defined(OS_WIN)
-
 #if defined (OS_MACOSX)
 #include "webkit/api/public/WebScreenInfo.h"
 #include "webkit/api/public/mac/WebScreenInfoFactory.h"
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index d382aff..250e0ab 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <string>
 
-#include "base/gfx/gtk_util.h"
+#include "app/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
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 6ff0ed5..8225487 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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/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"
 #include "base/command_line.h"
-#include "base/gfx/gdi_util.h"
 #include "base/gfx/rect.h"
 #include "base/histogram.h"
 #include "base/process_util.h"
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index 448e5a5..3359783 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -14,11 +14,11 @@
 
 #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"
 #include "base/path_service.h"
-#include "base/gfx/native_theme.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 14d2b49..69ec618 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -10,9 +10,9 @@
 #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/gfx/native_theme.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index a6e2d91..72b5c7f 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -14,10 +14,10 @@
 #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/resource_bundle.h"
 #include "base/file_util.h"
-#include "base/gfx/native_theme.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index b2eac08..733ad8a 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -10,12 +10,12 @@
 
 #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"
 #include "base/file_util.h"
 #include "base/string_util.h"
-#include "base/gfx/native_theme.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/language_combobox_model.h"
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index 73cbf8d..5b93bb2 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -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 "base/gfx/native_theme.h"
 #include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
diff --git a/chrome/plugin/webplugin_proxy.cc b/chrome/plugin/webplugin_proxy.cc
index ad0b1cb..252f3f2 100644
--- a/chrome/plugin/webplugin_proxy.cc
+++ b/chrome/plugin/webplugin_proxy.cc
@@ -8,9 +8,10 @@
 
 #include "app/gfx/canvas.h"
 #if defined(OS_WIN)
+#include "app/gfx/gdi_util.h"
 #include "app/win_util.h"
 #endif
-#include "base/gfx/blit.h"
+#include "app/gfx/blit.h"
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
 #endif
@@ -30,10 +31,6 @@
 #include "webkit/api/public/WebBindings.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
-#if defined(OS_WIN)
-#include "base/gfx/gdi_util.h"
-#endif
-
 using WebKit::WebBindings;
 using webkit_glue::WebPluginResourceClient;
 
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index b0e5ba0..ae98ac3 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -99,7 +99,7 @@
 #if defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * theming
-#include "base/gfx/native_theme.h"
+#include "app/gfx/native_theme_win.h"
 #endif
 
 using base::Time;
diff --git a/chrome/renderer/renderer_main_platform_delegate_win.cc b/chrome/renderer/renderer_main_platform_delegate_win.cc
index 12f8242..430107a7 100644
--- a/chrome/renderer/renderer_main_platform_delegate_win.cc
+++ b/chrome/renderer/renderer_main_platform_delegate_win.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 
+#include "app/gfx/native_theme_win.h"
 #include "base/command_line.h"
-#include "base/gfx/native_theme.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/renderer/webmediaplayer_impl.h b/chrome/renderer/webmediaplayer_impl.h
index 743e440..740c7db 100644
--- a/chrome/renderer/webmediaplayer_impl.h
+++ b/chrome/renderer/webmediaplayer_impl.h
@@ -45,11 +45,11 @@
 
 #include <vector>
 
-#include "base/gfx/platform_canvas.h"
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "media/base/filters.h"
 #include "media/base/pipeline_impl.h"
+#include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebMediaPlayer.h"
 #include "webkit/api/public/WebMediaPlayerClient.h"
 
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index ab787b0..2ebe048 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "app/gfx/blit.h"
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ -14,7 +15,6 @@
 #include "base/logging.h"
 #include "base/ref_counted.h"
 #include "base/string_util.h"
-#include "base/gfx/blit.h"
 #include "base/gfx/size.h"
 #include "base/gfx/native_widget_types.h"
 #include "chrome/common/child_process_logging.h"
diff --git a/printing/image.cc b/printing/image.cc
index b9c86dd..beff637 100644
--- a/printing/image.cc
+++ b/printing/image.cc
@@ -12,7 +12,7 @@
 #include "skia/ext/platform_device.h"
 
 #if defined(OS_WIN)
-#include "base/gfx/gdi_util.h"  // EMF support
+#include "app/gfx/gdi_util.h"  // EMF support
 #endif
 
 namespace {
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index 4cebf7b..59c6d0b 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -15,7 +15,6 @@
 #include "app/gfx/codec/png_codec.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
-#include "base/gfx/gdi_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "skia/ext/vector_canvas.h"
@@ -43,7 +42,7 @@ class Context {
  private:
   HDC context_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(Context);
+  DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 // Lightweight HBITMAP management.
@@ -51,7 +50,17 @@ class Bitmap {
  public:
   Bitmap(const Context& context, int x, int y) {
     BITMAPINFOHEADER hdr;
-    gfx::CreateBitmapHeader(x, y, &hdr);
+    hdr.biSize = sizeof(BITMAPINFOHEADER);
+    hdr.biWidth = x;
+    hdr.biHeight = -y;  // Minus means top-down bitmap.
+    hdr.biPlanes = 1;
+    hdr.biBitCount = 32;
+    hdr.biCompression = BI_RGB;  // No compression.
+    hdr.biSizeImage = 0;
+    hdr.biXPelsPerMeter = 1;
+    hdr.biYPelsPerMeter = 1;
+    hdr.biClrUsed = 0;
+    hdr.biClrImportant = 0;
     bitmap_ = CreateDIBSection(context.context(),
                                reinterpret_cast<BITMAPINFO*>(&hdr), 0,
                                &data_, NULL, 0);
@@ -67,7 +76,7 @@ class Bitmap {
 
   void* data_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(Bitmap);
+  DISALLOW_COPY_AND_ASSIGN(Bitmap);
 };
 
 // Lightweight raw-bitmap management. The image, once initialized, is immuable.
@@ -198,7 +207,7 @@ class Image {
   // Flag to signal if the comparison functions should ignore the alpha channel.
   const bool ignore_alpha_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(Image);
+  DISALLOW_COPY_AND_ASSIGN(Image);
 };
 
 // Base for tests. Capability to process an image.
@@ -294,7 +303,7 @@ class ImageTest : public testing::Test {
   // Path to directory used to contain the test data.
   std::wstring test_dir_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ImageTest);
+  DISALLOW_COPY_AND_ASSIGN(ImageTest);
 };
 
 // Premultiply the Alpha channel on the R, B and G channels.
diff --git a/skia/ext/vector_platform_device_win.cc b/skia/ext/vector_platform_device_win.cc
index 48375da..c89badd 100644
--- a/skia/ext/vector_platform_device_win.cc
+++ b/skia/ext/vector_platform_device_win.cc
@@ -6,12 +6,25 @@
 
 #include "skia/ext/vector_platform_device_win.h"
 
-#include "base/gfx/gdi_util.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkUtils.h"
 
 namespace skia {
 
+static void FillBitmapInfoHeader(int width, int height, BITMAPINFOHEADER* hdr) {
+  hdr->biSize = sizeof(BITMAPINFOHEADER);
+  hdr->biWidth = width;
+  hdr->biHeight = -height;  // Minus means top-down bitmap.
+  hdr->biPlanes = 1;
+  hdr->biBitCount = 32;
+  hdr->biCompression = BI_RGB;  // no compression
+  hdr->biSizeImage = 0;
+  hdr->biXPelsPerMeter = 1;
+  hdr->biYPelsPerMeter = 1;
+  hdr->biClrUsed = 0;
+  hdr->biClrImportant = 0;
+}
+
 VectorPlatformDevice* VectorPlatformDevice::create(HDC dc,
                                                    int width, int height) {
   InitializeDC(dc);
@@ -562,9 +575,18 @@ void VectorPlatformDevice::InternalDrawBitmap(const SkBitmap& bitmap,
   if (!src_size_x || !src_size_y)
     return;
 
-  // Create a BMP v4 header that we can serialize.
+  // Create a BMP v4 header that we can serialize. We use the shared "V3"
+  // fillter to fill the stardard items, then add in the "V4" stuff we want.
   BITMAPV4HEADER bitmap_header;
-  gfx::CreateBitmapV4Header(src_size_x, src_size_y, &bitmap_header);
+  memset(&bitmap_header, 0, sizeof(BITMAPV4HEADER));
+  FillBitmapInfoHeader(src_size_x, src_size_y,
+                       reinterpret_cast<BITMAPINFOHEADER*>(&bitmap_header));
+  bitmap_header.bV4Size = sizeof(BITMAPV4HEADER);
+  bitmap_header.bV4RedMask   = 0x00ff0000;
+  bitmap_header.bV4GreenMask = 0x0000ff00;
+  bitmap_header.bV4BlueMask  = 0x000000ff;
+  bitmap_header.bV4AlphaMask = 0xff000000;
+
   HDC dc = getBitmapDC();
   SkAutoLockPixels lock(bitmap);
   SkASSERT(bitmap.getConfig() == SkBitmap::kARGB_8888_Config);
@@ -589,7 +611,7 @@ void VectorPlatformDevice::InternalDrawBitmap(const SkBitmap& bitmap,
   }
 
   BITMAPINFOHEADER hdr;
-  gfx::CreateBitmapHeader(src_size_x, src_size_y, &hdr);
+  FillBitmapInfoHeader(src_size_x, src_size_y, &hdr);
   if (is_translucent) {
     // The image must be loaded as a bitmap inside a device context.
     HDC bitmap_dc = ::CreateCompatibleDC(dc);
diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc
index 31f47fc..a932d63 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 "base/gfx/native_theme.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/widget/widget.h"
 
diff --git a/views/controls/menu/menu_config_win.cc b/views/controls/menu/menu_config_win.cc
index 233eae68..f242f8c 100644
--- a/views/controls/menu/menu_config_win.cc
+++ b/views/controls/menu/menu_config_win.cc
@@ -8,7 +8,7 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "base/gfx/native_theme.h"
+#include "app/gfx/native_theme_win.h"
 #include "base/logging.h"
 #include "app/l10n_util_win.h"
 #include "base/win_util.h"
diff --git a/views/controls/menu/menu_item_view_win.cc b/views/controls/menu/menu_item_view_win.cc
index 8ec80eb3..a2f31fb 100644
--- a/views/controls/menu/menu_item_view_win.cc
+++ b/views/controls/menu/menu_item_view_win.cc
@@ -9,7 +9,7 @@
 #include <Vssym32.h>
 
 #include "app/gfx/canvas.h"
-#include "base/gfx/native_theme.h"
+#include "app/gfx/native_theme_win.h"
 #include "app/l10n_util.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/menu_config.h"
diff --git a/views/controls/menu/menu_scroll_view_container.cc b/views/controls/menu/menu_scroll_view_container.cc
index 54bfbdc..64aa4ab 100644
--- a/views/controls/menu/menu_scroll_view_container.cc
+++ b/views/controls/menu/menu_scroll_view_container.cc
@@ -19,7 +19,7 @@
 #include "views/controls/menu/submenu_view.h"
 
 #if defined(OS_WIN)
-#include "base/gfx/native_theme.h"
+#include "app/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 b2ffe5e2..7273a0a 100644
--- a/views/controls/menu/menu_separator_win.cc
+++ b/views/controls/menu/menu_separator_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -9,7 +9,7 @@
 #include <Vssym32.h>
 
 #include "app/gfx/canvas.h"
-#include "base/gfx/native_theme.h"
+#include "app/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/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc
index 7bcb7b9..cc78fb2 100644
--- a/views/controls/menu/native_menu_gtk.cc
+++ b/views/controls/menu/native_menu_gtk.cc
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "base/gfx/gtk_util.h"
+#include "app/gfx/gtk_util.h"
 #include "base/keyboard_codes.h"
 #include "base/string_util.h"
 #include "base/time.h"
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index 700da66..69d8670 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -10,6 +10,7 @@
 #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"
@@ -19,7 +20,6 @@
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
-#include "base/gfx/native_theme.h"
 
 namespace views {
 
diff --git a/views/controls/slider/native_slider_gtk.cc b/views/controls/slider/native_slider_gtk.cc
index 201fcda..a394d70 100644
--- a/views/controls/slider/native_slider_gtk.cc
+++ b/views/controls/slider/native_slider_gtk.cc
@@ -6,7 +6,7 @@
 
 #include "views/controls/slider/native_slider_gtk.h"
 
-#include "base/gfx/gtk_util.h"
+#include "app/gfx/gtk_util.h"
 #include "views/controls/slider/slider.h"
 
 namespace views {
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index fa8a2c7..043ce83 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -8,9 +8,9 @@
 
 #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/gfx/native_theme.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
diff --git a/views/controls/textfield/native_textfield_gtk.cc b/views/controls/textfield/native_textfield_gtk.cc
index 3d9471f..ebaa614 100644
--- a/views/controls/textfield/native_textfield_gtk.cc
+++ b/views/controls/textfield/native_textfield_gtk.cc
@@ -6,7 +6,7 @@
 
 #include "views/controls/textfield/native_textfield_gtk.h"
 
-#include "base/gfx/gtk_util.h"
+#include "app/gfx/gtk_util.h"
 #include "base/string_util.h"
 #include "skia/ext/skia_utils_gtk.h"
 #include "views/controls/textfield/textfield.h"
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index 39abb10..500ad72 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -2,14 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "views/controls/textfield/native_textfield_win.h"
+
 #include <algorithm>
 
 #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/gfx/native_theme.h"
 #include "base/keyboard_codes.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
@@ -17,7 +19,6 @@
 #include "skia/ext/skia_utils_win.h"
 #include "views/controls/menu/menu_win.h"
 #include "views/controls/native/native_view_host.h"
-#include "views/controls/textfield/native_textfield_win.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/focus/focus_manager.h"
 #include "views/focus/focus_util_win.h"
diff --git a/views/controls/textfield/native_textfield_win.h b/views/controls/textfield/native_textfield_win.h
index 6ba8165..6955453 100644
--- a/views/controls/textfield/native_textfield_win.h
+++ b/views/controls/textfield/native_textfield_win.h
@@ -13,6 +13,7 @@
 #include <tom.h>  // For ITextDocument, a COM interface to CRichEditCtrl
 #include <vsstyle.h>
 
+#include "app/gfx/insets.h"
 #include "base/scoped_comptr_win.h"
 #include "views/controls/menu/simple_menu_model.h"
 #include "views/controls/textfield/native_textfield_wrapper.h"
diff --git a/views/drag_utils_win.cc b/views/drag_utils_win.cc
index b2d35f2..9b9bd26 100644
--- a/views/drag_utils_win.cc
+++ b/views/drag_utils_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -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 "base/gfx/gdi_util.h"
 
 namespace drag_utils {
 
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index d272e1f..6f30622 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "views/widget/widget_win.h"
 
 #include "app/gfx/canvas.h"
+#include "app/gfx/native_theme_win.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util_win.h"
 #include "app/win_util.h"
-#include "base/gfx/native_theme.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "views/accessibility/view_accessibility.h"
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 5261679..40355d4 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -26,7 +26,7 @@
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 #if defined(OS_WIN)
-#include "base/gfx/native_theme.h"
+#include "app/gfx/native_theme_win.h"
 #else
 #include "views/window/hit_test.h"
 #include "views/widget/widget.h"
diff --git a/webkit/glue/plugins/gtk_plugin_container_manager.cc b/webkit/glue/plugins/gtk_plugin_container_manager.cc
index ecde3fb..8fe30a6 100644
--- a/webkit/glue/plugins/gtk_plugin_container_manager.cc
+++ b/webkit/glue/plugins/gtk_plugin_container_manager.cc
@@ -6,7 +6,7 @@
 
 #include <gtk/gtk.h>
 
-#include "base/gfx/gtk_util.h"
+#include "app/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "webkit/glue/plugins/gtk_plugin_container.h"
 #include "webkit/glue/webplugin.h"
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
index 61cb7ec..78ce170 100644
--- a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
+++ b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc
@@ -10,9 +10,9 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
+#include "app/gfx/blit.h"
 #include "base/basictypes.h"
 #include "base/file_util.h"
-#include "base/gfx/blit.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/stats_counters.h"
diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc
index 8331c7a..63e1e3c 100644
--- a/webkit/glue/webcursor_win.cc
+++ b/webkit/glue/webcursor_win.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved.  Use of this
+// Copyright (c) 2009 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 "base/gfx/gdi_util.h"
+#include "app/gfx/gdi_util.h"
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "grit/webkit_resources.h"
diff --git a/webkit/glue/webthemeengine_impl_win.cc b/webkit/glue/webthemeengine_impl_win.cc
index 85de8cb..f60f9ac 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 "base/gfx/native_theme.h"
+#include "app/gfx/native_theme_win.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/skia_utils_win.h"
 #include "webkit/api/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 437c8bc..4c2e1b8 100644
--- a/webkit/tools/test_shell/test_shell_platform_delegate_win.cc
+++ b/webkit/tools/test_shell/test_shell_platform_delegate_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -6,9 +6,10 @@
 #include <list>
 #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/gfx/native_theme.h"
 #include "base/resource_util.h"
 #include "base/win_util.h"
 #include "webkit/tools/test_shell/foreground_helper.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
index 8ba512b..728c5ad 100644
--- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
@@ -9,7 +9,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
-#include "base/gfx/gtk_util.h"
+#include "app/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index 3afdfaa..ff790b1 100644
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -12,7 +12,7 @@
 #include <shlobj.h>
 #include <shlwapi.h>
 
-#include "base/gfx/gdi_util.h"
+#include "app/gfx/gdi_util.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/gfx/point.h"
 #include "base/message_loop.h"