summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-18 10:58:55 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-18 10:58:55 +0000
commita7e36cf8f37767b9354881769e9eb916971629ce (patch)
treeb504d0025b8b82c03c27cb130c1e0de0ea29466b
parent229688ddef58126e746dcb26b9cb8dbf55ae3586 (diff)
downloadchromium_src-a7e36cf8f37767b9354881769e9eb916971629ce.zip
chromium_src-a7e36cf8f37767b9354881769e9eb916971629ce.tar.gz
chromium_src-a7e36cf8f37767b9354881769e9eb916971629ce.tar.bz2
Fix service process to not idle-timeout if Chromoting is enabled.
When Chromoting is enabled via Chrome, the service process is started if necessary and notified that the Chromoting service has become enabled. When the service process is later auto-started (or run manually) it will initialize Chromoting, which detects that it is enabled and starts up, but fails to inform the service process that it's enabled, so the process waits a while and then exits. BUG=73168 TEST=Enable Chromoting in Chrome. Kill the existing service process and start a new one manually. Ensure that the new one runs for at least two minutes without quitting. Review URL: http://codereview.chromium.org/6532023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75381 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/service/remoting/chromoting_host_manager.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/service/remoting/chromoting_host_manager.cc b/chrome/service/remoting/chromoting_host_manager.cc
index 3b73a9f..c2621b9 100644
--- a/chrome/service/remoting/chromoting_host_manager.cc
+++ b/chrome/service/remoting/chromoting_host_manager.cc
@@ -40,6 +40,11 @@ void ChromotingHostManager::Initialize(
}
if (IsEnabled()) {
+ // TODO(wez): Need to callback the Observer so that ServiceProcess
+ // knows to stay alive to service Chromoting requests.
+ // This will go away once we have a more consistent model for the
+ // service process internals.
+ observer_->OnChromotingHostEnabled();
Start();
}
}