Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1397)

Unified Diff: remoting/remoting.gyp

Issue 10384127: Chromoting: the Me2me host now presents a notification on the console allowing a user to disconnect… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 0195b5a49dd358229b728c2326f60925de5a512c..921c914efe4b532abced1149245ca29e2007272a 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -861,6 +861,9 @@
'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',
@@ -872,7 +875,6 @@
'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',
@@ -923,8 +925,8 @@
'<(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'
],
}],
@@ -1306,6 +1308,8 @@
'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',
@@ -1335,6 +1339,8 @@
'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',
@@ -1377,6 +1383,7 @@
],
'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'
],
@@ -1402,8 +1409,20 @@
'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',
},
@@ -1669,6 +1688,8 @@
'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',
« remoting/host/disconnect_window_mac.mm ('K') | « remoting/host/simple_host_process.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698