diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 21:06:24 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 21:06:24 +0000 |
| commit | 60ccc243dfbfc86001cf1c0a4b44131a39d7d28d (patch) | |
| tree | 8834337b7ad8eec985fd783d382734c5d9388eed /remoting/remoting.gyp | |
| parent | f05d582b7e213b15138697c01abf48c652ff271a (diff) | |
| download | chromium_src-60ccc243dfbfc86001cf1c0a4b44131a39d7d28d.zip chromium_src-60ccc243dfbfc86001cf1c0a4b44131a39d7d28d.tar.gz chromium_src-60ccc243dfbfc86001cf1c0a4b44131a39d7d28d.tar.bz2 | |
[Chromoting] Added support of a list of desktop sessions on the daemon side.
DaemonProcess object keeps a list of active desktop sessions, each representing the screen, input devices, etc to be remoted to another machine. The network process is expected to request a desktop session to be opened once a connection has been accepted and closed when the client session is destroyed. This CL includes changes on the daemon side only.
BUG=134694
Review URL: https://chromiumcodereview.appspot.com/11017065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 6e3365e..9fbb51a 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -626,6 +626,10 @@ 'host/daemon_process.cc', 'host/daemon_process.h', 'host/daemon_process_win.cc', + 'host/desktop_session.cc', + 'host/desktop_session.h', + 'host/desktop_session_win.cc', + 'host/desktop_session_win.h', 'host/host_exit_codes.h', 'host/ipc_consts.cc', 'host/ipc_consts.h', @@ -1426,6 +1430,7 @@ 'remoting_protocol', 'differ_block', '../crypto/crypto.gyp:crypto', + '../ipc/ipc.gyp:ipc', ], 'defines': [ 'VERSION=<(version_full)', @@ -1446,6 +1451,8 @@ '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', @@ -1626,12 +1633,6 @@ ], }, }], - ['OS=="win"', { - 'sources': [ - 'host/chromoting_messages.cc', - 'host/chromoting_messages.h', - ], - }], ], }, # end of target 'remoting_host' @@ -1700,7 +1701,6 @@ '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../google_apis/google_apis.gyp:google_apis', - '../ipc/ipc.gyp:ipc', '../media/media.gyp:media', '../net/net.gyp:net', ], @@ -2031,9 +2031,18 @@ 'codec/video_encoder_row_based_unittest.cc', 'codec/video_encoder_vp8_unittest.cc', 'host/audio_capturer_win_unittest.cc', + 'host/branding.cc', + 'host/branding.h', 'host/chromoting_host_context_unittest.cc', 'host/chromoting_host_unittest.cc', 'host/client_session_unittest.cc', + 'host/config_file_watcher.cc', + 'host/config_file_watcher.h', + 'host/daemon_process.cc', + 'host/daemon_process.h', + 'host/daemon_process_unittest.cc', + 'host/desktop_session.cc', + 'host/desktop_session.h', 'host/differ_block_unittest.cc', 'host/differ_unittest.cc', 'host/heartbeat_sender_unittest.cc', @@ -2101,9 +2110,6 @@ ], 'conditions': [ [ 'OS=="win"', { - 'dependencies': [ - '../ipc/ipc.gyp:ipc', - ], 'include_dirs': [ '../breakpad/src', ], |