Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/....

app/app_base.gypi

 # Copyright (c) 2010 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.
 
 {
   'target_defaults': {
     'variables': {
       'app_base_target': 0,
     },
     'target_conditions': [
@@ skipping 98 matching lines @@
         'clipboard/clipboard_mac.mm',
         'clipboard/clipboard_util_win.cc',
         'clipboard/clipboard_util_win.h',
         'clipboard/clipboard_win.cc',
         'clipboard/scoped_clipboard_writer.cc',
         'clipboard/scoped_clipboard_writer.h',
         'combobox_model.h',
         'drag_drop_types_gtk.cc',
         'drag_drop_types_win.cc',
         'drag_drop_types.h',
+        'event_synthesis_gtk.cc',
+        'event_synthesis_gtk.h',
         'file_download_interface.h',
         'gfx/font_util.h',
         'gfx/font_util.cc',
         'gfx/gl/gl_bindings.h',
         'gfx/gl/gl_context.cc',
         'gfx/gl/gl_context.h',
         'gfx/gl/gl_context_linux.cc',
         'gfx/gl/gl_context_mac.cc',
         'gfx/gl/gl_context_osmesa.cc',
         'gfx/gl/gl_context_osmesa.h',
         'gfx/gl/gl_context_stub.h',
         'gfx/gl/gl_context_win.cc',
         'gfx/gl/gl_headers.h',
         'gfx/gl/gl_implementation.cc',
         'gfx/gl/gl_implementation.h',
         'gfx/gl/gl_implementation_linux.cc',
         'gfx/gl/gl_implementation_mac.cc',
         'gfx/gl/gl_implementation_win.cc',
         'gfx/gl/gl_interface.h',
         'gfx/gl/gl_interface.cc',
         'gfx/gl/gl_mock.h',
         'gtk_dnd_util.cc',
         'gtk_dnd_util.h',
         'gtk_signal.h',
         'gtk_signal_registrar.cc',
         'gtk_signal_registrar.h',
         'gtk_util.cc',
         'gtk_util.h',
+        'keyboard_code_conversion.cc',
+        'keyboard_code_conversion.h',
+        'keyboard_code_conversion_gtk.cc',
+        'keyboard_code_conversion_gtk.h',
+        'keyboard_code_conversion_mac.mm',
+        'keyboard_code_conversion_mac.h',
+        'keyboard_code_conversion_win.cc',
+        'keyboard_code_conversion_win.h',
+        'keyboard_codes.h',
+        'keyboard_codes_win.h',
+        'keyboard_codes_posix.h',
         'l10n_util.cc',
         'l10n_util.h',
         'l10n_util_mac.h',
         'l10n_util_mac.mm',
         'l10n_util_posix.cc',
         'l10n_util_win.cc',
         'l10n_util_win.h',
         'linear_animation.cc',
         'linear_animation.h',
         'menus/accelerator.h',
@@ skipping 141 matching lines @@
         }],
         ['OS=="linux"', {
           'sources': [
             'gfx/gl/gl_context_egl.cc',
             'gfx/gl/gl_context_egl.h',
             '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
             '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h',
             '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc',
             '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h',
           ],
+          'sources!': [
+            'keyboard_code_conversion_mac.mm',
+            'keyboard_code_conversion_mac.h',
+            'keyboard_codes_win.h',
+          ],
           'include_dirs': [
             # We don't use angle, but pull the EGL/GLES headers from there.
             '../third_party/angle/include',
           ],
           'all_dependent_settings': {
             'defines': [
               'GL_GLEXT_PROTOTYPES',
             ],
             'ldflags': [
               '-L<(PRODUCT_DIR)',
             ],
             'link_settings': {
               'libraries': [
                 '-lX11',
                 '-ldl',
               ],
             },
           },
         }],
         ['OS=="mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
             ],
           },
+          'sources!': [
+            'event_synthesis_gtk.cc',
+            'event_synthesis_gtk.h',
+            'keyboard_code_conversion_gtk.cc',
+            'keyboard_code_conversion_gtk.h',
+            'keyboard_codes_win.h',
+          ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             '../third_party/angle/include',
           ],
           'sources': [
             'gfx/gl/gl_context_egl.cc',
             'gfx/gl/gl_context_egl.h',
             '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
             '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h',
             '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc',
             '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h',
           ],
+          'sources!': [
+            'event_synthesis_gtk.cc',
+            'event_synthesis_gtk.h',
+            'keyboard_code_conversion_gtk.cc',
+            'keyboard_code_conversion_gtk.h',
+            'keyboard_code_conversion_mac.mm',
+            'keyboard_code_conversion_mac.h',
+            'keyboard_codes_posix.h',
+          ],
         }],
       ],
     },
   ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'app_base_nacl_win64',
           'type': '<(library)',
@@ skipping 33 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }