Move ash specific cursor code to CursorManager.

ui/ui.gyp

 # Copyright (c) 2012 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': {
     'chromium_code': 1,
   },
   'includes': [
     'ui_resources.gypi',
@@ skipping 119 matching lines @@
         'base/cocoa/fullscreen_window_manager.h',
         'base/cocoa/fullscreen_window_manager.mm',
         'base/cocoa/nib_loading.h',
         'base/cocoa/nib_loading.mm',
         'base/cocoa/underlay_opengl_hosting_window.h',
         'base/cocoa/underlay_opengl_hosting_window.mm',
         'base/cocoa/window_size_constants.h',
         'base/cocoa/window_size_constants.mm',
         'base/cursor/cursor.cc',
         'base/cursor/cursor.h',
+        'base/cursor/cursor_loader.h',
+        'base/cursor/cursor_loader_win.cc',
+        'base/cursor/cursor_loader_win.h',
+        'base/cursor/cursor_loader_x11.cc',
+        'base/cursor/cursor_loader_x11.h',
         'base/cursor/cursor_win.cc',
         'base/cursor/cursor_x11.cc',
         'base/dialogs/base_shell_dialog.cc',
         'base/dialogs/base_shell_dialog.h',
         'base/dialogs/base_shell_dialog_win.cc',
         'base/dialogs/base_shell_dialog_win.h',
         'base/dialogs/gtk/select_file_dialog_impl.cc',
         'base/dialogs/gtk/select_file_dialog_impl.h',
         'base/dialogs/gtk/select_file_dialog_impl_gtk.cc',
         'base/dialogs/gtk/select_file_dialog_impl_kde.cc',
@@ skipping 382 matching lines @@
             ['exclude', 'base/x/root_window_property_watcher_x.cc'],
             ['exclude', 'base/x/root_window_property_watcher_x.h'],
             ['exclude', 'base/x/work_area_watcher_x.cc'],
             ['exclude', 'base/x/work_area_watcher_x.h'],
             ['exclude', 'ui_controls_win.cc'],
            ],
         }, {  # use_aura!=1
           'sources!': [
             'base/cursor/cursor.cc',
             'base/cursor/cursor.h',
+            'base/cursor/cursor_loader_x11.cc',
+            'base/cursor/cursor_loader_x11.h',
             'base/cursor/cursor_win.cc',
             'base/cursor/cursor_x11.cc',
             'base/native_theme/native_theme_aura.cc',
             'base/native_theme/native_theme_aura.h',
           ]
         }],
         ['use_aura==1 and OS=="win"', {
           'sources/': [
             ['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'],
             ['exclude', 'base/dragdrop/os_exchange_data_provider_win.h'],
@@ skipping 184 matching lines @@
             },
           },
         }, {  # use_x11==0
           'sources/': [
             ['exclude', 'base/keycodes/keyboard_code_conversion_x.*'],
             ['exclude', 'base/x/*'],
           ],
         }],
         ['toolkit_views==0', {
           'sources!': [
+            'base/event.cc',
             'base/events/event.cc',
             'base/events/event.h',
             'base/x/events_x.cc',

[oshima, 2012/09/07 23:08:20]

this is for aura as well?

[mazda, 2012/09/08 00:27:02]

Remvoed base/event.cc, which was accidentally added for some reason.
As for base/x/events_x.cc, it uses MueesagePumpAuraX11::GetDefaultXDisplay. But
other parts look independent on Aura. We may be able to move this out with a few
change.

           ],
         }],
         ['OS=="android"', {
           'sources!': [
             'base/dragdrop/drag_utils.cc',
             'base/dragdrop/drag_utils.h',
             'base/touch/touch_factory.cc',
             'base/touch/touch_factory.h',
             'gfx/pango_util.cc',
             'gfx/pango_util.h',
@@ skipping 21 matching lines @@
     },
   ],
   'conditions': [
     ['inside_chromium_build == 1', {
       'includes': [
         'ui_unittests.gypi',
       ]},
     ],
   ],
 }