Revert 272740 "Refactor and move ash independent accelerator han..."

trunk/src/ash/ash.gyp

-#a Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# 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,
     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
   },
   'includes': [
     'ash_resources.gypi',
@@ skipping 36 matching lines @@
       ],
       'defines': [
         'ASH_IMPLEMENTATION',
       ],
       'sources': [
         # All .cc, .h under ash, except unittests
         'accelerators/accelerator_commands.cc',
         'accelerators/accelerator_commands.h',
         'accelerators/accelerator_controller.cc',
         'accelerators/accelerator_controller.h',
-        'accelerators/nested_accelerator_delegate.cc',
-        'accelerators/nested_accelerator_delegate.h',
+        'accelerators/accelerator_dispatcher.cc',
+        'accelerators/accelerator_dispatcher.h',
+        'accelerators/accelerator_dispatcher_linux.cc',
+        'accelerators/accelerator_dispatcher_win.cc',
         'accelerators/accelerator_filter.cc',
         'accelerators/accelerator_filter.h',
         'accelerators/accelerator_table.cc',
         'accelerators/accelerator_table.h',
         'accelerators/debug_commands.cc',
         'accelerators/debug_commands.h',
         'accelerators/exit_warning_handler.cc',
         'accelerators/exit_warning_handler.h',
         'accelerators/key_hold_detector.cc',
         'accelerators/key_hold_detector.h',
         'accelerators/focus_manager_factory.cc',
         'accelerators/focus_manager_factory.h',
         'accelerators/magnifier_key_scroller.cc',
         'accelerators/magnifier_key_scroller.h',
+        'accelerators/nested_dispatcher_controller.cc',
+        'accelerators/nested_dispatcher_controller.h',
         'accelerators/spoken_feedback_toggler.cc',
         'accelerators/spoken_feedback_toggler.h',
         'accelerometer/accelerometer_controller.cc',
         'accelerometer/accelerometer_controller.h',
         'accelerometer/accelerometer_observer.h',
         'accessibility_delegate.h',
         'audio/sounds.cc',
         'audio/sounds.h',
         'autoclick/autoclick_controller.cc',
         'autoclick/autoclick_controller.h',
@@ skipping 825 matching lines @@
         'ash_resources',
         'ash_test_support',
         'ash_with_content',
       ],
       'sources': [
         'accelerators/accelerator_commands_unittest.cc',
         'accelerators/accelerator_controller_unittest.cc',
         'accelerators/accelerator_filter_unittest.cc',
         'accelerators/accelerator_table_unittest.cc',
         'accelerators/magnifier_key_scroller_unittest.cc',
+        'accelerators/nested_dispatcher_controller_unittest.cc',
         'accelerators/spoken_feedback_toggler_unittest.cc',
         'autoclick/autoclick_unittest.cc',
         'desktop_background/desktop_background_controller_unittest.cc',
         'desktop_background/wallpaper_resizer_unittest.cc',
         'dip_unittest.cc',
         'display/display_change_observer_chromeos_unittest.cc',
         'display/display_controller_unittest.cc',
         'display/display_error_observer_chromeos_unittest.cc',
         'display/display_info_unittest.cc',
         'display/display_manager_unittest.cc',
@@ skipping 283 matching lines @@
       'conditions': [
         ['chromeos==1', {
           'dependencies': [
             '../ui/display/display.gyp:display',
           ],
         }],
       ],
     },
   ],
 }