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

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',
           ],

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',

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")

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"

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"

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"

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;

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"
 

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"

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"
 

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"

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"

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"

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"

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"

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)

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"

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"

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,

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"