Chromoting: the Me2me host now presents a notification on the console allowing a user to disconnect…

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,
     # Use consistent strings across all platforms. Note that the plugin name
@@ skipping 839 matching lines @@
       'product_prefix': '<(host_plugin_prefix)',
       'dependencies': [
         'remoting_base',
         'remoting_host',
         'remoting_jingle_glue',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
       'sources': [
         'host/branding.cc',
         'host/branding.h',
+        'host/host_ui_resource.h',
+        'host/host_user_interface.cc',
+        'host/host_user_interface.h',
         'host/it2me_host_user_interface.cc',
         'host/it2me_host_user_interface.h',
         'host/plugin/daemon_controller.h',
         'host/plugin/daemon_controller_linux.cc',
         'host/plugin/daemon_controller_mac.cc',
         'host/plugin/daemon_controller_win.cc',
         'host/plugin/daemon_installer_win.cc',
         'host/plugin/daemon_installer_win.h',
         'host/plugin/host_log_handler.cc',
         'host/plugin/host_log_handler.h',
         'host/plugin/host_plugin.cc',
-        'host/plugin/host_plugin_resource.h',
         'host/plugin/host_plugin_utils.cc',
         'host/plugin/host_plugin_utils.h',
         'host/plugin/host_script_object.cc',
         'host/plugin/host_script_object.h',
       ],
       'conditions': [
         ['OS=="mac"', {
           'mac_bundle': 1,
           'xcode_settings': {
             'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
@@ skipping 30 matching lines @@
           'dependencies': [
             '../google_update/google_update.gyp:google_update',
             '../ipc/ipc.gyp:ipc',
             'remoting_elevated_controller',
             'remoting_version_resources',
           ],
           'include_dirs': [
             '<(INTERMEDIATE_DIR)',
           ],
           'sources': [
+            'host/host_ui.rc',
             'host/plugin/host_plugin.def',
-            'host/plugin/host_plugin.rc',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_version.rc'
           ],
         }],
       ],
     },  # end of target 'remoting_host_plugin'
 
     {
       'target_name': 'remoting_webapp',
       'type': 'none',
       'dependencies': [
@@ skipping 361 matching lines @@
       ],
       'sources': [
         'host/continue_window.h',
         'host/continue_window_mac.mm',
         'host/continue_window_linux.cc',
         'host/continue_window_win.cc',
         'host/disconnect_window_linux.cc',
         'host/disconnect_window_mac.h',
         'host/disconnect_window_mac.mm',
         'host/disconnect_window_win.cc',
+        'host/host_user_interface.cc',
+        'host/host_user_interface.h',
         'host/it2me_host_user_interface.cc',
         'host/it2me_host_user_interface.h',
         'host/simple_host_process.cc',
       ],
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
             '../ipc/ipc.gyp:ipc'
           ],
         }],
       ],
     },  # end of target 'remoting_simple_host'
 
     {
       'target_name': 'remoting_me2me_host',
       'type': 'executable',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         'remoting_base',
         'remoting_host',
         'remoting_jingle_glue',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../media/media.gyp:media',
       ],
       'sources': [
         'host/branding.cc',
         'host/branding.h',
         'host/host_event_logger.h',
+        'host/host_user_interface.cc',
+        'host/host_user_interface.h',
         'host/sighup_listener_mac.cc',
         'host/sighup_listener_mac.h',
         'host/remoting_me2me_host.cc',
       ],
       'conditions': [
         ['os_posix==1', {
           'sources': [
             'host/host_event_logger_posix.cc',
           ],
         }],
         ['OS=="mac"', {
           'mac_bundle': 1,
           'conditions': [
             ['branding == "Chrome"', {
               'variables': {
                  'host_bundle_id': 'com.google.chrome_remote_desktop.remoting_me2me_host',
               },
             }, { # else branding!="Chrome"
               'variables': {
                 'host_bundle_id': 'org.chromium.chromoting.remoting_me2me_host',
               },
             }],
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'host/remoting_me2me_host-Info.plist',
             'INFOPLIST_PREPROCESS': 'YES',
             'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)" COPYRIGHT_BY="<(copyright_by)"',
           },
           'mac_bundle_resources': [
+            'host/disconnect_window.xib',
             'host/remoting_me2me_host.icns',
             'host/remoting_me2me_host-Info.plist',
           ],
           'mac_bundle_resources!': [
             'host/remoting_me2me_host-Info.plist',
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
             '../ipc/ipc.gyp:ipc',
             'remoting_version_resources',
           ],
           'sources': [
             'host/host_event_logger_win.cc',
+            'host/host_ui.rc',
             'host/remoting_host_messages.mc',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_me2me_host_version.rc'
           ],
           'include_dirs': [
             '<(INTERMEDIATE_DIR)',
           ],
           # Rule to run the message compiler.
           'rules': [
             {
               'rule_name': 'message_compiler',
               'extension': 'mc',
               'inputs': [ ],
               'outputs': [
                 '<(INTERMEDIATE_DIR)/remoting_host_messages.h',
                 '<(INTERMEDIATE_DIR)/remoting_host_messages.rc',
               ],
               'msvs_cygwin_shell': 0,
               'msvs_quote_cmd': 0,
               'action': [
                 'mc.exe -h <(INTERMEDIATE_DIR) -r <(INTERMEDIATE_DIR) <(RULE_INPUT_PATH)',
               ],
               'process_outputs_as_sources': 1,
               'message': 'Running message compiler on <(RULE_INPUT_PATH).',
             },
           ],
+          'link_settings': {
+            'libraries': [
+              '-lcomctl32.lib',
+            ],
+          },
           'msvs_settings': {
             'VCLinkerTool': {
+              'AdditionalOptions': [
+                "\"/manifestdependency:type='win32' "
+                    "name='Microsoft.Windows.Common-Controls' "
+                    "version='6.0.0.0' "
+                    "processorArchitecture='*' "
+                    "publicKeyToken='6595b64144ccf1df' language='*'\"",
+              ],
               # 2 == /SUBSYSTEM:WINDOWS
               'SubSystem': '2',
             },
           },
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_me2me_host'
 
     {
       'target_name': 'remoting_host_keygen',
@@ skipping 245 matching lines @@
         'host/capturer_win_unittest.cc',
         'host/chromoting_host_context_unittest.cc',
         'host/chromoting_host_unittest.cc',
         'host/client_session_unittest.cc',
         'host/differ_block_unittest.cc',
         'host/differ_unittest.cc',
         'host/heartbeat_sender_unittest.cc',
         'host/host_key_pair_unittest.cc',
         'host/host_mock_objects.cc',
         'host/host_mock_objects.h',
+        'host/host_user_interface.cc',
+        'host/host_user_interface.h',
         'host/it2me_host_user_interface.cc',
         'host/it2me_host_user_interface.h',
         'host/json_host_config_unittest.cc',
         'host/log_to_server_unittest.cc',
         'host/pin_hash_unittest.cc',
         'host/register_support_host_request_unittest.cc',
         'host/remote_input_filter_unittest.cc',
         'host/screen_recorder_unittest.cc',
         'host/server_log_entry_unittest.cc',
         'host/test_key_pair.h',
@@ skipping 59 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }