Remove chromoting host registration from service process. More IPCs to control

chrome/service/service_ipc_server.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/service/service_ipc_server.h"
 
 #include "chrome/common/service_messages.h"
 #include "chrome/service/cloud_print/cloud_print_proxy.h"
 #include "chrome/service/service_process.h"
 #include "ipc/ipc_logging.h"
@@ skipping 65 matching lines @@
 
   return channel_->Send(msg);
 }
 
 void ServiceIPCServer::OnMessageReceived(const IPC::Message& msg) {
   IPC_BEGIN_MESSAGE_MAP(ServiceIPCServer, msg)
     IPC_MESSAGE_HANDLER(ServiceMsg_EnableCloudPrintProxy,
                         OnEnableCloudPrintProxy)
     IPC_MESSAGE_HANDLER(ServiceMsg_EnableCloudPrintProxyWithTokens,
                         OnEnableCloudPrintProxyWithTokens)
-    IPC_MESSAGE_HANDLER(ServiceMsg_EnableRemotingWithTokens,
-                        OnEnableRemotingWithTokens)
     IPC_MESSAGE_HANDLER(ServiceMsg_DisableCloudPrintProxy,
                         OnDisableCloudPrintProxy)
     IPC_MESSAGE_HANDLER(ServiceMsg_IsCloudPrintProxyEnabled,
                         OnIsCloudPrintProxyEnabled)
+    IPC_MESSAGE_HANDLER(ServiceMsg_SetChromotingHostCredentials,

[Alpha Left Google, 2010/12/16 21:32:44]

Use ifdef here.

[Sergey Ulanov, 2010/12/17 00:05:43]

Done.

+                        OnSetChromotingHostCredentials)
+    IPC_MESSAGE_HANDLER(ServiceMsg_EnableChromotingHost,
+                        OnEnableChromotingHost)
+    IPC_MESSAGE_HANDLER(ServiceMsg_DisableChromotingHost,
+                        OnDisableChromotingHost)
+    IPC_MESSAGE_HANDLER(ServiceMsg_GetChromotingHostInfo,
+                        OnGetChromotingHostInfo)
     IPC_MESSAGE_HANDLER(ServiceMsg_Hello, OnHello);
     IPC_MESSAGE_HANDLER(ServiceMsg_Shutdown, OnShutdown);
     IPC_MESSAGE_HANDLER(ServiceMsg_UpdateAvailable, OnUpdateAvailable);
   IPC_END_MESSAGE_MAP()
 }
 
 void ServiceIPCServer::OnEnableCloudPrintProxy(const std::string& lsid) {
   g_service_process->GetCloudPrintProxy()->EnableForUser(lsid);
 }
 
 void ServiceIPCServer::OnEnableCloudPrintProxyWithTokens(
     const std::string& cloud_print_token, const std::string& talk_token) {
   // TODO(sanjeevr): Implement this.
   NOTIMPLEMENTED();
 }
 
 void ServiceIPCServer::OnIsCloudPrintProxyEnabled() {
   std::string email;
   bool is_enabled = g_service_process->GetCloudPrintProxy()->IsEnabled(&email);
   channel_->Send(new ServiceHostMsg_CloudPrintProxy_IsEnabled(is_enabled,
                                                               email));
 }
 
-void ServiceIPCServer::OnEnableRemotingWithTokens(
+void ServiceIPCServer::OnSetChromotingHostCredentials(
     const std::string& login,
-    const std::string& remoting_token,
-    const std::string& talk_token) {
+    const std::string& auth_token) {
 #if defined(ENABLE_REMOTING)

[Alpha Left Google, 2010/12/16 21:32:44]

Use one ifdef to include there all.

[Sergey Ulanov, 2010/12/17 00:05:43]

Done.

-  g_service_process->EnableChromotingHostWithTokens(login, remoting_token,
-                                                    talk_token);
+  g_service_process->chromoting_host_manager()->SetCredentials(
+      login, auth_token);
 #endif
 }
 
+void ServiceIPCServer::OnEnableChromotingHost() {
+#if defined(ENABLE_REMOTING)
+  g_service_process->chromoting_host_manager()->Enable();
+#endif
+}
+
+void ServiceIPCServer:: OnDisableChromotingHost() {
+#if defined(ENABLE_REMOTING)
+  g_service_process->chromoting_host_manager()->Disable();
+#endif
+}
+
+void ServiceIPCServer:: OnGetChromotingHostInfo() {
+#if defined(ENABLE_REMOTING)
+  remoting::ChromotingHostInfo host_info;
+  g_service_process->chromoting_host_manager()->GetHostInfo(&host_info);
+  channel_->Send(new ServiceHostMsg_ChromotingHost_HostInfo(host_info));
+#endif
+}
+
 void ServiceIPCServer::OnDisableCloudPrintProxy() {
   g_service_process->GetCloudPrintProxy()->DisableForUser();
 }
 
 void ServiceIPCServer::OnHello() {
   channel_->Send(new ServiceHostMsg_GoodDay());
 }
 
 void ServiceIPCServer::OnShutdown() {
   g_service_process->Shutdown();
 }
 
 void ServiceIPCServer::OnUpdateAvailable() {
   g_service_process->SetUpdateAvailable();
 }
-