Revert 273723 "Wire input events through the ViewManagerClient i..."

trunk/src/mojo/mojo_services.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_echo_bindings',
       'type': 'static_library',
       'sources': [
         'services/dbus_echo/echo.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_cpp_bindings',
-        'mojo_geometry_bindings',
-      ],
-    },
-    {
-      'target_name': 'mojo_input_events_lib',
-      'type': '<(component)',
-      'defines': [
-        'MOJO_INPUT_EVENTS_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../ui/events/events.gyp:events',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_environment_chromium',
-        'mojo_input_events_bindings',
-        'mojo_geometry_bindings',
-        'mojo_geometry_lib',
-        'mojo_system_impl',
-      ],
-      'sources': [
-        'services/public/cpp/input_events/lib/input_events_type_converters.cc',
-        'services/public/cpp/input_events/input_events_type_converters.h',
       ],
     },
     {
       'target_name': 'mojo_input_events_bindings',
       'type': 'static_library',
       'sources': [
         'services/public/interfaces/input_events/input_events.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
@@ skipping 98 matching lines @@
         '../base/base.gyp:base',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_application',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_gles2_service',
-        'mojo_input_events_lib',
         'mojo_native_viewport_bindings',
         'mojo_system_impl',
       ],
       'defines': [
         'MOJO_NATIVE_VIEWPORT_IMPLEMENTATION',
       ],
       'sources': [
         'services/native_viewport/native_viewport.h',
         'services/native_viewport/native_viewport_android.cc',
         'services/native_viewport/native_viewport_mac.mm',
@@ skipping 29 matching lines @@
       'sources': [
         'services/public/interfaces/view_manager/view_manager.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_cpp_bindings',
         'mojo_geometry_bindings',
-        'mojo_input_events_bindings',
       ],
     },
     {
       'target_name': 'mojo_view_manager_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
@@ skipping 62 matching lines @@
   'conditions': [
     ['use_aura==1', {
       'targets': [
         {
           'target_name': 'mojo_view_manager',
           'type': '<(component)',
           'dependencies': [
             '../base/base.gyp:base',
             '../skia/skia.gyp:skia',
             '../ui/aura/aura.gyp:aura',
-            '../ui/aura/aura.gyp:aura_test_support',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
-            '../ui/wm/wm.gyp:wm',
             'mojo_aura_support',
             'mojo_common_lib',
             'mojo_environment_chromium',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
             'mojo_gles2',
-            'mojo_input_events_lib',
             'mojo_launcher_bindings',
             'mojo_main_chromium',
             'mojo_native_viewport_bindings',
             'mojo_system_impl',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
           ],
           'sources': [
             'services/view_manager/ids.h',
             'services/view_manager/main.cc',
@@ skipping 82 matching lines @@
             'mojo_system_impl',
           ],
           'sources': [
             'services/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
     }],
   ],
 }