Revert 158366 - Cleanups in Chromoting Host.

remoting/remoting.gyp

Index: remoting/remoting.gyp
===================================================================
--- remoting/remoting.gyp	(revision 158399)
+++ remoting/remoting.gyp	(working copy)
@@ -593,10 +593,11 @@
             'host/chromoting_messages.h',
             'host/config_file_watcher.cc',
             'host/config_file_watcher.h',
+            'host/constants.h',
+            'host/constants_win.cc',
             'host/daemon_process.cc',
             'host/daemon_process.h',
             'host/daemon_process_win.cc',
-            'host/host_exit_codes.h',
             'host/usage_stats_consent.h',
             'host/usage_stats_consent_win.cc',
             'host/win/host_service.cc',
@@ -945,6 +946,8 @@
         'base/breakpad_linux.cc',
         'base/breakpad_mac.mm',
         'base/breakpad_win.cc',
+        'host/constants.h',
+        'host/constants_win.cc',
       ],
       'conditions': [
         ['OS=="win"', {
@@ -1082,8 +1085,6 @@
         'host/plugin/host_plugin_utils.h',
         'host/plugin/host_script_object.cc',
         'host/plugin/host_script_object.h',
-        'host/win/omaha.cc',
-        'host/win/omaha.h',
       ],
       'conditions': [
         ['OS=="mac"', {
@@ -1342,8 +1343,10 @@
         'host/clipboard_linux.cc',
         'host/clipboard_mac.mm',
         'host/clipboard_win.cc',
+        'host/constants.h',
         'host/constants_mac.cc',
         'host/constants_mac.h',
+        'host/constants_win.cc',
         'host/continue_window.h',
         'host/continue_window_gtk.cc',
         'host/continue_window_mac.mm',
@@ -1371,7 +1374,6 @@
         'host/heartbeat_sender.h',
         'host/host_config.cc',
         'host/host_config.h',
-        'host/host_exit_codes.h',
         'host/host_key_pair.cc',
         'host/host_key_pair.h',
         'host/host_port_allocator.cc',
@@ -1444,8 +1446,6 @@
         'host/vlog_net_log.h',
         'host/win/desktop.cc',
         'host/win/desktop.h',
-        'host/win/omaha.cc',
-        'host/win/omaha.h',
         'host/win/scoped_thread_desktop.cc',
         'host/win/scoped_thread_desktop.h',
         'host/win/session_desktop_environment_factory.cc',
Property changes on: remoting/remoting.gyp
___________________________________________________________________
Added: svn:mergeinfo