Move webcursors code from webkit/ to content.

content/content_common.gypi

Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 8e46bb5b3c4be2c59489cf8bb1f8fe723eb2c2df..fb0206ed216da5ded04c8fa0db5f5fed849199be 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -26,13 +26,19 @@
   'sources': [
     'public/common/assert_matching_enums.cc',
     'public/common/bindings_policy.h',
+    'public/common/browser_plugin_permission_type.h',
     'public/common/child_process_host.h',
     'public/common/child_process_host_delegate.cc',
     'public/common/child_process_host_delegate.h',
     'public/common/child_process_sandbox_support_linux.h',
     'public/common/color_suggestion.cc',
     'public/common/color_suggestion.h',
+    'public/common/common_param_traits.cc',
+    'public/common/common_param_traits.h',
+    'public/common/common_param_traits_macros.h',
     'public/common/console_message_level.h',
+    'public/common/content_client.cc',
+    'public/common/content_client.h',
     'public/common/content_constants.cc',
     'public/common/content_constants.h',
     'public/common/content_descriptors.h',
@@ -106,6 +112,8 @@
     'public/common/user_agent.h',
     'public/common/webplugininfo.cc',
     'public/common/webplugininfo.h',
+    'public/common/window_container_type.cc',
+    'public/common/window_container_type.h',
     'public/common/zygote_fork_delegate_linux.h',
     'common/accessibility_messages.h',
     'common/all_messages.h',
@@ -149,6 +157,17 @@
     'common/content_switches_internal.h',
     'common/cookie_data.cc',
     'common/cookie_data.h',
+    'common/cursors/webcursor.cc',
+    'common/cursors/webcursor.h',
+    'common/cursors/webcursor_android.cc',
+    'common/cursors/webcursor_aura.cc',
+    'common/cursors/webcursor_aurawin.cc',
+    'common/cursors/webcursor_aurax11.cc',
+    'common/cursors/webcursor_gtk.cc',
+    'common/cursors/webcursor_gtk_data.h',
+    'common/cursors/webcursor_mac.mm',
+    'common/cursors/webcursor_null.cc',
+    'common/cursors/webcursor_win.cc',
     'common/database_messages.h',
     'common/date_time_suggestion.h',
     'common/desktop_notification_messages.h',
@@ -270,12 +289,12 @@
     'common/indexed_db/indexed_db_messages.h',
     'common/indexed_db/indexed_db_param_traits.cc',
     'common/indexed_db/indexed_db_param_traits.h',
-    'common/input/input_event_stream_validator.cc',
-    'common/input/input_event_stream_validator.h',
     'common/input/gesture_event_stream_validator.cc',
     'common/input/gesture_event_stream_validator.h',
     'common/input/input_event.cc',
     'common/input/input_event.h',
+    'common/input/input_event_stream_validator.cc',
+    'common/input/input_event_stream_validator.h',
     'common/input/input_param_traits.cc',
     'common/input/input_param_traits.h',
     'common/input/scoped_web_input_event.cc',
@@ -402,10 +421,10 @@
     'common/swapped_out_messages.cc',
     'common/swapped_out_messages.h',
     'common/text_input_client_messages.h',
-    'common/user_agent.cc',
-    'common/user_agent_ios.mm',
     'common/url_schemes.cc',
     'common/url_schemes.h',
+    'common/user_agent.cc',
+    'common/user_agent_ios.mm',
     'common/utility_messages.h',
     'common/view_message_enums.h',
     'common/view_messages.h',
@@ -417,16 +436,19 @@
     'common/worker_messages.h',
     'common/zygote_commands_linux.h',
     'port/common/input_event_ack_state.h',
-    'public/common/browser_plugin_permission_type.h',
-    'public/common/common_param_traits.cc',
-    'public/common/common_param_traits.h',
-    'public/common/common_param_traits_macros.h',
-    'public/common/content_client.cc',
-    'public/common/content_client.h',
-    'public/common/window_container_type.cc',
-    'public/common/window_container_type.h',
   ],
   'conditions': [
+    ['use_aura==1', {
+      'sources!': [
+        'common/cursors/webcursor_mac.mm',
+        'common/cursors/webcursor_win.cc',
+      ],
+    }],
+    ['use_ozone==0', {
+      'sources!': [
+        'common/cursors/webcursor_null.cc',
+      ],
+    }],
     ['OS=="ios"', {
       # iOS has different user-agent construction utilities, since the
       # version strings is not derived from webkit_version, and follows
@@ -480,6 +502,9 @@
       ],
     }],
     ['OS=="mac"', {
+      'dependencies': [
+        '../webkit/webkit_resources.gyp:webkit_resources',
+      ],
       'sources': [
         'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc',
         'common/gpu/client/gpu_memory_buffer_impl_io_surface.h',