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

chrome/browser/service/service_process_control.cc

 // Copyright (c) 2010 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/browser/service/service_process_control.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/process_util.h"
 #include "base/stl_util-inl.h"
@@ skipping 225 matching lines @@
 
   // We don't need the launcher anymore.
   launcher_ = NULL;
 }
 
 void ServiceProcessControl::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(ServiceProcessControl, message)
       IPC_MESSAGE_HANDLER(ServiceHostMsg_GoodDay, OnGoodDay)
       IPC_MESSAGE_HANDLER(ServiceHostMsg_CloudPrintProxy_IsEnabled,
                           OnCloudPrintProxyIsEnabled)
+      IPC_MESSAGE_HANDLER(ServiceHostMsg_RemotingHost_HostInfo,
+                          OnRemotingHostInfo)
   IPC_END_MESSAGE_MAP()
 }
 
 void ServiceProcessControl::OnChannelConnected(int32 peer_pid) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   RunConnectDoneTasks();
 }
 
 void ServiceProcessControl::OnChannelError() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 10 matching lines @@
 
 // NotificationObserver implementation.
 void ServiceProcessControl::Observe(NotificationType type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   if (type == NotificationType::UPGRADE_RECOMMENDED) {
     Send(new ServiceMsg_UpdateAvailable);
   }
 }
 
-
 void ServiceProcessControl::OnGoodDay() {
   if (!message_handler_)
     return;
 
   message_handler_->OnGoodDay();
 }
 
 void ServiceProcessControl::OnCloudPrintProxyIsEnabled(bool enabled,
                                                        std::string email) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (cloud_print_status_callback_ != NULL) {
     cloud_print_status_callback_->Run(enabled, email);
     cloud_print_status_callback_.reset();
   }
 }
 
+void ServiceProcessControl::OnRemotingHostInfo(
+    remoting::ChromotingHostInfo host_info) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (remoting_host_status_callback_ != NULL) {
+    remoting_host_status_callback_->Run(host_info);
+    remoting_host_status_callback_.reset();
+  }
+}
+
+bool ServiceProcessControl::GetCloudPrintProxyStatus(
+    Callback2<bool, std::string>::Type* cloud_print_status_callback) {
+  DCHECK(cloud_print_status_callback);
+  cloud_print_status_callback_.reset(cloud_print_status_callback);
+  return Send(new ServiceMsg_IsCloudPrintProxyEnabled);
+}
+
 bool ServiceProcessControl::SendHello() {
   return Send(new ServiceMsg_Hello());
 }
 
 bool ServiceProcessControl::Shutdown() {
   bool ret = Send(new ServiceMsg_Shutdown());
   channel_.reset();
   return ret;
 }
 
-bool ServiceProcessControl::EnableRemotingWithTokens(
+bool ServiceProcessControl::SetRemotingHostCredentials(
     const std::string& user,
-    const std::string& remoting_token,
     const std::string& talk_token) {
   return Send(
-      new ServiceMsg_EnableRemotingWithTokens(user, remoting_token,
-                                              talk_token));
+      new ServiceMsg_SetRemotingHostCredentials(user, talk_token));
 }
 
-bool ServiceProcessControl::GetCloudPrintProxyStatus(
-    Callback2<bool, std::string>::Type* cloud_print_status_callback) {
-  DCHECK(cloud_print_status_callback);
-  cloud_print_status_callback_.reset(cloud_print_status_callback);
-  return Send(new ServiceMsg_IsCloudPrintProxyEnabled);
+bool ServiceProcessControl::EnableRemotingHost() {
+  return Send(new ServiceMsg_EnableRemotingHost());
+}
+
+bool ServiceProcessControl::DisableRemotingHost() {
+  return Send(new ServiceMsg_DisableRemotingHost());
+}
+
+bool ServiceProcessControl::GetRemotingHostStatus(
+    GetRemotingHostStatusCallback* status_callback) {
+  DCHECK(status_callback);
+  remoting_host_status_callback_.reset(status_callback);
+  return Send(new ServiceMsg_GetRemotingHostInfo);
 }
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcessControl);