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

app/app.gyp

 # 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.
 
 {
   'variables': {
     # TODO: remove this helper when we have loops in GYP
     'apply_locales_cmd': ['python', '../chrome/tools/build/apply_locales.py',],
     'chromium_code': 1,
   },
@@ skipping 63 matching lines @@
         'clipboard/clipboard_mac.mm',
         'clipboard/clipboard_util_win.cc',
         'clipboard/clipboard_util_win.h',
         'clipboard/clipboard_win.cc',
         'clipboard/scoped_clipboard_writer.cc',
         'clipboard/scoped_clipboard_writer.h',
         'combobox_model.h',
         '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',
         'gfx/canvas_mac.mm',
         'gfx/canvas_win.cc',
         'gfx/codec/jpeg_codec.cc',
         'gfx/codec/jpeg_codec.h',
         'gfx/codec/png_codec.cc',
         'gfx/codec/png_codec.h',
         'gfx/font.h',
         'gfx/font_gtk.cc',
         'gfx/font_mac.mm',
         'gfx/font_skia.cc',
         'gfx/font_win.cc',
         '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',
         'gfx/skbitmap_operations.cc',
         'gfx/skbitmap_operations.h',
         'gfx/text_elider.cc',
         'gfx/text_elider.h',
         'gtk_dnd_util.cc',
         'gtk_dnd_util.h',
         'l10n_util.cc',
@@ skipping 69 matching lines @@
         }],
         ['OS=="win"', {
           'sources': [
             'win_util.cc',
             'win_util.h',
           ],
         }],
         ['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',
           ],
         }],
       ],
     },
     {
       'target_name': 'app_unittests',
       'type': 'executable',
       'msvs_guid': 'B4D59AE8-8D2F-97E1-A8E9-6D2826729530',
@@ skipping 11 matching lines @@
         '../third_party/zlib/zlib.gyp:zlib',
       ],
       'sources': [
         'animation_unittest.cc',
         'clipboard/clipboard_unittest.cc',
         'gfx/codec/jpeg_codec_unittest.cc',
         'gfx/codec/png_codec_unittest.cc',
         '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',
         'l10n_util_unittest.cc',
         'os_exchange_data_win_unittest.cc',
         'run_all_unittests.cc',
         'test_suite.h',
         'sql/connection_unittest.cc',
         'sql/statement_unittest.cc',
         'sql/transaction_unittest.cc',
         'tree_node_iterator_unittest.cc',
         'win_util_unittest.cc',
       ],
       'include_dirs': [
         '..',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
         }],
         ['OS!="win"', {
           'sources!': [
             'gfx/icon_util_unittest.cc',
+            'gfx/native_theme_win_unittest.cc',
             'os_exchange_data_win_unittest.cc',
             'win_util_unittest.cc',
           ],
         }],
       ],
     },
     {
       'target_name': 'app_strings',
       'msvs_guid': 'AE9BF4A2-19C5-49D8-BB1A-F28496DD7051',
       'type': 'none',
@@ skipping 115 matching lines @@
                 'process_outputs_as_sources': 1,
                 'message': 'Generating appid information in <(SHARED_INTERMEDIATE_DIR)/chrome/appid.h'
               },
             ],
           },
         ],
       ],
     },
   ],
 }