Making DesktopEnvironment a factory class used by ClientSession to create audio/video capturers and…

remoting/remoting.gyp

 # 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': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
 
@@ skipping 328 matching lines @@
             'host/audio_capturer.h',
             'host/audio_capturer_linux.cc',
             'host/audio_capturer_linux.h',
             'host/audio_capturer_mac.cc',
             'host/audio_capturer_win.cc',
             'host/audio_capturer_win.h',
             'host/audio_scheduler.cc',
             'host/audio_scheduler.h',
             'host/audio_silence_detector.cc',
             'host/audio_silence_detector.h',
+            'host/basic_desktop_environment.cc',
+            'host/basic_desktop_environment.h',
             'host/capture_scheduler.cc',
             'host/capture_scheduler.h',
             'host/chromoting_host.cc',
             'host/chromoting_host.h',
             'host/chromoting_host_context.cc',
             'host/chromoting_host_context.h',
             'host/chromoting_messages.cc',
             'host/chromoting_messages.h',
             'host/client_session.cc',
             'host/client_session.h',
             'host/clipboard.h',
             'host/clipboard_linux.cc',
             'host/clipboard_mac.mm',
             'host/clipboard_win.cc',
             'host/constants_mac.cc',
             'host/constants_mac.h',
             'host/continue_window.h',
             'host/continue_window_gtk.cc',
             'host/continue_window_mac.mm',
             'host/continue_window_win.cc',
-            'host/desktop_environment.cc',
             'host/desktop_environment.h',
-            'host/desktop_environment_factory.cc',
-            'host/desktop_environment_factory.h',
             'host/desktop_resizer.h',
             'host/desktop_resizer_linux.cc',
             'host/desktop_resizer_win.cc',
             'host/desktop_resizer_mac.cc',
             'host/desktop_session_connector.h',
             'host/desktop_session_proxy.cc',
             'host/desktop_session_proxy.h',
             'host/disconnect_window.h',
             'host/disconnect_window_gtk.cc',
             'host/disconnect_window_mac.h',
@@ skipping 20 matching lines @@
             'host/host_secret.h',
             'host/host_status_observer.h',
             'host/host_user_interface.cc',
             'host/host_user_interface.h',
             'host/in_memory_host_config.cc',
             'host/in_memory_host_config.h',
             'host/ipc_audio_capturer.cc',
             'host/ipc_audio_capturer.h',
             'host/ipc_constants.cc',
             'host/ipc_constants.h',
-            'host/ipc_desktop_environment_factory.cc',
-            'host/ipc_desktop_environment_factory.h',
             'host/ipc_desktop_environment.cc',
             'host/ipc_desktop_environment.h',
             'host/ipc_event_executor.cc',
             'host/ipc_event_executor.h',
             'host/ipc_video_frame_capturer.cc',
             'host/ipc_video_frame_capturer.h',
             'host/it2me_host_user_interface.cc',
             'host/it2me_host_user_interface.h',
             'host/json_host_config.cc',
             'host/json_host_config.h',
@@ skipping 50 matching lines @@
             'host/video_scheduler.cc',
             'host/video_scheduler.h',
             'host/vlog_net_log.cc',
             'host/vlog_net_log.h',
             'host/win/launch_process_with_token.cc',
             'host/win/launch_process_with_token.h',
             'host/win/omaha.cc',
             'host/win/omaha.h',
             'host/win/security_descriptor.cc',
             'host/win/security_descriptor.h',
-            'host/win/session_desktop_environment_factory.cc',
-            'host/win/session_desktop_environment_factory.h',
+            'host/win/session_desktop_environment.cc',
+            'host/win/session_desktop_environment.h',
             'host/win/session_event_executor.cc',
             'host/win/session_event_executor.h',
             'host/win/window_station_and_desktop.cc',
             'host/win/window_station_and_desktop.h',
           ],
           'conditions': [
             ['toolkit_uses_gtk==1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
               ],
@@ skipping 1881 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }