Revert 98306 - Create a new views_aura_desktop.

views/views.gyp

 # Copyright (c) 2011 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,
   },
 
   'target_defaults': {
@@ skipping 224 matching lines @@
         'drag_utils_win.cc',
         'events/event.cc',
         'events/event.h',
         'events/event_aura.cc',
         'events/event_gtk.cc',
         'events/event_win.cc',
         'events/event_utils_win.cc',
         'events/event_utils_win.h',
         'events/event_x.cc',
         'focus/accelerator_handler.h',
-        'focus/accelerator_handler_aura.cc',
         'focus/accelerator_handler_gtk.cc',
         'focus/accelerator_handler_touch.cc',
         'focus/accelerator_handler_win.cc',
         'focus/external_focus_tracker.cc',
         'focus/external_focus_tracker.h',
         'focus/focus_manager.cc',
         'focus/focus_manager.h',
         'focus/focus_manager_factory.cc',
         'focus/focus_manager_factory.h',
         'focus/focus_search.cc',
@@ skipping 48 matching lines @@
         'touchui/gesture_manager.cc',
         'touchui/gesture_manager.h',
         'touchui/touch_factory.cc',
         'touchui/touch_factory.h',
         'touchui/touch_selection_controller.cc',
         'touchui/touch_selection_controller.h',
         'touchui/touch_selection_controller_impl.cc',
         'touchui/touch_selection_controller_impl.h',
         'view.cc',
         'view.h',
-        'view_aura.cc',
         'view_constants.cc',
         'view_constants.h',
         'view_gtk.cc',
         'view_text_utils.cc',
         'view_text_utils.h',
         'view_win.cc',
         'views_delegate.h',
         'widget/aero_tooltip_manager.cc',
         'widget/aero_tooltip_manager.h',
         'widget/child_window_message_processor.cc',
@@ skipping 66 matching lines @@
         ['use_aura==1', {
           'dependencies': [
             '../aura/aura.gyp:aura',
           ],
           'sources!': [
             'controls/native_control.cc',
             'widget/aero_tooltip_manager.cc',
             'widget/child_window_message_processor.cc',
             'widget/child_window_message_processor.h',
           ],
-          'conditions': [
-            ['OS=="win"', {
-              'sources/': [
-                ['include', 'controls/menu/menu_config_win.cc'],
-                ['include', 'controls/menu/menu_item_view_win.cc'],
-                ['include', 'controls/menu/menu_separator_win.cc'],
-                ['include', 'drag_utils_win.cc'],
-              ],
-            }],
-          ],
         }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:x11',
             '../build/linux/system.gyp:xext',
           ],
           'sources!': [
             'accessibility/native_view_accessibility_win.cc',
             'controls/scrollbar/bitmap_scroll_bar.cc',
@@ skipping 350 matching lines @@
               '-limm32.lib',
               '-loleacc.lib',
             ]
           },
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
         }],
       ],
     },
-    {
-      'target_name': 'views_aura_desktop',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:base_i18n',
-        '../skia/skia.gyp:skia',
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
-        '../ui/ui.gyp:gfx_resources',
-        '../ui/ui.gyp:ui',
-        '../ui/ui.gyp:ui_resources',
-        '../ui/ui.gyp:ui_resources_standard',
-        'views',
-        'views_desktop_lib',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'aura_desktop/aura_desktop_main.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'link_settings': {
-            'libraries': [
-              '-limm32.lib',
-              '-loleacc.lib',
-            ]
-          },
-          'include_dirs': [
-            '<(DEPTH)/third_party/wtl/include',
-          ],
-        }],
-      ],
-    },
 
 
   ],
 }