Move: drag_drop_types, favicon_size, icon_util, insets, path, message_box_fla...

chrome/chrome.gyp

Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp	(revision 15367)
+++ chrome/chrome.gyp	(working copy)
@@ -127,6 +127,8 @@
         # All .cc, .h, and .mm files under app/ except for tests.
         '../app/animation.cc',
         '../app/animation.h',
+        '../app/drag_drop_types.cc',
+        '../app/drag_drop_types.h',
         '../app/gfx/chrome_canvas.cc',
         '../app/gfx/chrome_canvas.h',
         '../app/gfx/chrome_canvas_linux.cc',
@@ -136,11 +138,21 @@
         '../app/gfx/chrome_font_mac.mm',
         '../app/gfx/chrome_font_skia.cc',
         '../app/gfx/chrome_font_win.cc',
+        '../app/gfx/favicon_size.h',
+        '../app/gfx/icon_util.cc',
+        '../app/gfx/icon_util.h',
+        '../app/gfx/insets.h',        
+        '../app/gfx/path_gtk.cc',
+        '../app/gfx/path_win.cc',
+        '../app/gfx/path.h',
         '../app/l10n_util.cc',
         '../app/l10n_util.h',
         '../app/l10n_util_posix.cc',
         '../app/l10n_util_win.cc',
         '../app/l10n_util_win.h',        
+        '../app/message_box_flags.h',
+        '../app/os_exchange_data.cc',
+        '../app/os_exchange_data.h',
         '../app/resource_bundle.cc',
         '../app/resource_bundle.h',
         '../app/resource_bundle_win.cc',
@@ -162,6 +174,16 @@
             '../build/linux/system.gyp:gtk',
           ],
         }],
+        ['OS!="win"', {
+          'sources!': [
+            '../app/drag_drop_types.cc',
+            '../app/drag_drop_types.h',
+            '../app/gfx/icon_util.cc',
+            '../app/gfx/icon_util.h',
+            '../app/os_exchange_data.cc',
+            '../app/os_exchange_data.h',
+          ],
+        }],        
       ],
     },
     {
@@ -230,13 +252,6 @@
         'common/gfx/color_utils.h',
         'common/gfx/emf.cc',
         'common/gfx/emf.h',
-        'common/gfx/favicon_size.h',
-        'common/gfx/icon_util.cc',
-        'common/gfx/icon_util.h',
-        'common/gfx/insets.h',
-        'common/gfx/path_gtk.cc',
-        'common/gfx/path_win.cc',
-        'common/gfx/path.h',
         'common/gfx/text_elider.cc',
         'common/gfx/text_elider.h',
         'common/gfx/utils.h',
@@ -287,8 +302,6 @@
         'common/debug_flags.h',
         'common/devtools_messages.h',
         'common/devtools_messages_internal.h',
-        'common/drag_drop_types.cc',
-        'common/drag_drop_types.h',
         'common/env_vars.cc',
         'common/env_vars.h',
         'common/file_descriptor_set_posix.cc',
@@ -324,7 +337,6 @@
         'common/logging_chrome.cc',
         'common/logging_chrome.h',
         'common/main_function_params.h',
-        'common/message_box_flags.h',
         'common/message_router.cc',
         'common/message_router.h',
         'common/modal_dialog_event.h',
@@ -342,8 +354,6 @@
         'common/notification_service.h',
         'common/notification_source.h',
         'common/notification_type.h',
-        'common/os_exchange_data.cc',
-        'common/os_exchange_data.h',
         'common/owned_widget_gtk.cc',
         'common/owned_widget_gtk.h',
         'common/page_action.h',
@@ -449,10 +459,7 @@
         }, { # else: OS != "win"
           'sources!': [
             'common/gfx/emf.cc',
-            'common/gfx/icon_util.cc',
             'common/classfactory.cc',
-            'common/drag_drop_types.cc',
-            'common/os_exchange_data.cc',
           ],
         }],
       ],
@@ -2498,7 +2505,7 @@
         'common/file_descriptor_set_unittest.cc',
         '../app/gfx/chrome_font_unittest.cc',
         'common/gfx/emf_unittest.cc',
-        'common/gfx/icon_util_unittest.cc',
+        '../app/gfx/icon_util_unittest.cc',
         'common/gfx/text_elider_unittest.cc',
         'common/important_file_writer_unittest.cc',
         'common/ipc_message_unittest.cc',
@@ -2510,7 +2517,7 @@
         'common/mru_cache_unittest.cc',
         'common/net/url_util_unittest.cc',
         'common/notification_service_unittest.cc',
-        'common/os_exchange_data_unittest.cc',
+        '../app/os_exchange_data_unittest.cc',
         'common/pref_member_unittest.cc',
         'common/pref_service_unittest.cc',
         'common/property_bag_unittest.cc',
@@ -2627,9 +2634,9 @@
             'browser/window_sizer_unittest.cc',
             'common/chrome_plugin_unittest.cc',
             'common/gfx/emf_unittest.cc',
-            'common/gfx/icon_util_unittest.cc',
+            '../app/gfx/icon_util_unittest.cc',
             'common/net/url_util_unittest.cc',
-            'common/os_exchange_data_unittest.cc',
+            '../app/os_exchange_data_unittest.cc',
             'test/browser_with_test_window_test.cc',
             'test/browser_with_test_window_test.h',
             'views/controls/label_unittest.cc',