Refactor the client code. Move all x11-related code into X11View and create...

remoting/remoting.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'target_defaults': {
@@ skipping 33 matching lines @@
           'link_settings': {
             'libraries': [
               '-ldl',
               '-lX11',
               '-lXrender',
               '-lXext',
             ],
           },
           'sources': [
             'client/x11_client.cc',
+            'client/x11_input_handler.cc',
+            'client/x11_input_handler.h',
             'client/x11_view.cc',
             'client/x11_view.h',
           ],
         },  # end of target 'chromoting_x11_client'
       ],
     }],  # end of OS conditions for x11 client
 
   ],  # end of 'conditions'
 
   'targets': [
     {
       'target_name': 'chromoting_plugin',
       'type': 'static_library',
       'defines': [
         'HAVE_STDINT_H',  # Required by on2_integer.h
       ],
       'dependencies': [
         'chromoting_base',
         'chromoting_client',
         'chromoting_jingle_glue',
         '../third_party/ppapi/ppapi.gyp:ppapi_cpp_objects',
         '../third_party/zlib/zlib.gyp:zlib',
       ],
       'sources': [
         'client/plugin/chromoting_plugin.cc',
         'client/plugin/chromoting_plugin.h',
         'client/plugin/pepper_entrypoints.cc',
         'client/plugin/pepper_entrypoints.h',
+        'client/plugin/pepper_input_handler.cc',
+        'client/plugin/pepper_input_handler.h',
         'client/plugin/pepper_view.cc',
         'client/plugin/pepper_view.h',
         'client/plugin/pepper_util.cc',
         'client/plugin/pepper_util.h',
         '../media/base/yuv_convert.cc',
         '../media/base/yuv_convert.h',
         '../media/base/yuv_row.h',
         '../media/base/yuv_row_table.cc',
       ],
       'conditions': [
@@ skipping 123 matching lines @@
       'target_name': 'chromoting_client',
       'type': '<(library)',
       'dependencies': [
         'chromoting_base',
         'chromoting_jingle_glue',
       ],
       'sources': [
         'client/chromoting_client.cc',
         'client/chromoting_client.h',
         'client/chromoting_view.h',
+        'client/client_config.h',
+        'client/client_context.cc',
+        'client/client_context.h',
         'client/client_util.cc',
         'client/client_util.h',
         'client/decoder.h',
         'client/decoder_verbatim.cc',
         'client/decoder_verbatim.h',
         'client/host_connection.h',
+        'client/input_handler.h',
         'client/jingle_host_connection.cc',
         'client/jingle_host_connection.h',
       ],
     },  # end of target 'chromoting_client'
 
     {
       'target_name': 'chromoting_simple_host',
       'type': 'executable',
       'dependencies': [
         'chromoting_base',
@@ skipping 15 matching lines @@
       'target_name': 'chromoting_host_keygen',
       'type': 'executable',
       'dependencies': [
         'chromoting_base',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
       ],
       'sources': [
         'host/keygen_main.cc',
       ],
-    },  # end of target 'chromoting_simple_host'
-
-    {
-      'target_name': 'chromoting_simple_client',
-      'type': 'executable',
-      'dependencies': [
-        'chromoting_base',
-        'chromoting_client',
-        'chromoting_jingle_glue',
-      ],
-      'sources': [
-        'client/simple_client.cc',
-      ],
-    },  # end of target 'chromoting_simple_client'
+    },  # end of target 'chromoting_host_keygen'
 
     {
       'target_name': 'chromoting_jingle_glue',
       'type': '<(library)',
       'dependencies': [
         '../net/net.gyp:net',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libjingle/libjingle.gyp:libjingle_p2p',
       ],
       'export_dependent_settings': [
@@ skipping 104 matching lines @@
       ],  # end of 'conditions'
     },  # end of target 'chromoting_unittests'
   ],  # end of targets
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: