diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 22:15:09 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-18 22:15:09 +0000 |
| commit | b9eb8b20e029cf288b36da336e4c5611c9a65a55 (patch) | |
| tree | 4134579298bc01ebbedc060f511caa40902a8d84 /remoting/host | |
| parent | c3265d8866e5b0d2c1b129e4da685755a35a84b2 (diff) | |
| download | chromium_src-b9eb8b20e029cf288b36da336e4c5611c9a65a55.zip chromium_src-b9eb8b20e029cf288b36da336e4c5611c9a65a55.tar.gz chromium_src-b9eb8b20e029cf288b36da336e4c5611c9a65a55.tar.bz2 | |
Revert 56600 - ServiceProcessControlBrowserTest.LaunchAndIPC crashes.
Start/stop service process when browser starts and stop
Save the information that the setup of remoting has completed.
After setup has been completed we start and stop service process when
--enable-remoting presents when browser starts.
Also save the information in the service process that host is registered
and ready to be used. Again start chromoting host automatically once
the host registration is done.
Review URL: http://codereview.chromium.org/3185015
TBR=hclam@chromium.org
Review URL: http://codereview.chromium.org/3107024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/chromoting_host.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc index 1bc7b98..3e47f54 100644 --- a/remoting/host/chromoting_host.cc +++ b/remoting/host/chromoting_host.cc @@ -255,11 +255,6 @@ void ChromotingHost::DoShutdown() { jingle_client_->Close(); } - // Stop the heartbeat sender. - if (heartbeat_sender_) { - heartbeat_sender_->Stop(); - } - // Lastly call the shutdown task. if (shutdown_task_.get()) { shutdown_task_->Run(); |