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

chrome/browser/service/service_process_control.h

 // 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.
 
 #ifndef CHROME_BROWSER_SERVICE_SERVICE_PROCESS_CONTROL_H_
 #define CHROME_BROWSER_SERVICE_SERVICE_PROCESS_CONTROL_H_
 
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/callback.h"
 #include "base/process.h"
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "ipc/ipc_sync_channel.h"
 
 class Profile;
 
+namespace remoting {
+class ChromotingHostInfo;
+}  // namespace remoting
+
 // A ServiceProcessControl works as a portal between the service process and
 // the browser process.
 //
 // It is used to start and terminate the service process. It is also used
 // to send and receive IPC messages from the service process.
 //
 // THREADING
 //
 // This class is accessed on the UI thread through some UI actions. It then
 // talks to the IPC channel on the IO thread.
 class ServiceProcessControl : public IPC::Channel::Sender,
                               public IPC::Channel::Listener,
                               public NotificationObserver {
  public:
   typedef IDMap<ServiceProcessControl>::iterator iterator;
   typedef std::queue<IPC::Message> MessageQueue;
+  typedef Callback1<const remoting::ChromotingHostInfo&>::Type
+      GetChromotingHostStatusCallback;
 
   // An interface for handling messages received from the service process.
   class MessageHandler {
    public:
     virtual ~MessageHandler() {}
     // This is a test signal sent from the service process. This can be used
     // the healthiness of the service.
     virtual void OnGoodDay() = 0;
   };
 
@@ skipping 30 matching lines @@
   virtual bool Send(IPC::Message* message);
 
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   // Message handlers
   void OnGoodDay();
   void OnCloudPrintProxyIsEnabled(bool enabled, std::string email);
+  void OnChromotingHostInfo(remoting::ChromotingHostInfo host_info);
 
   // Send a hello message to the service process for testing purpose.
   // Return true if the message was sent.
   bool SendHello();
 
   // Send a shutdown message to the service process. IPC channel will be
   // destroyed after calling this method.
   // Return true if the message was sent.
   bool Shutdown();
 
-  // Send a message to enable the remoting service in the service process.
-  // Return true if the message was sent.
-  bool EnableRemotingWithTokens(const std::string& user,
-                                const std::string& remoting_token,
-                                const std::string& talk_token);
-
   // Send a message to the service process to request a response
   // containing the enablement status of the cloud print proxy and the
   // registered email address.  The callback gets the information when
   // received.
   bool GetCloudPrintProxyStatus(
       Callback2<bool, std::string>::Type* cloud_print_status_callback);
 
+  // Send a message to enable the remoting service in the service process.
+  // Return true if the message was sent.
+  bool SetChromotingHostCredentials(const std::string& user,
+                                    const std::string& auth_token);
+
+  bool EnableChromotingHost();

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

This should have a callback to get the results of enabling.

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

per our discussion, I will add other messages to monitor status and errors
later.

+  bool DisableChromotingHost();
+
+  bool GetChromotingHostStatus(
+      GetChromotingHostStatusCallback* status_callback);
+
   // Set the message handler for receiving messages from the service process.
   // TODO(hclam): Allow more than 1 handler.
   void SetMessageHandler(MessageHandler* message_handler) {
     message_handler_ = message_handler;
   }
 
  private:
   class Launcher;
   typedef std::vector<Task*> TaskList;
 
@@ skipping 20 matching lines @@
   // if there was a failure in connecting.
   TaskList connect_done_tasks_;
   // Callbacks that get invoked ONLY when the channel is successfully connected.
   TaskList connect_success_tasks_;
   // Callbacks that get invoked ONLY when there was a connection failure.
   TaskList connect_failure_tasks_;
 
   // Callback that gets invoked when a status message is received from
   // the cloud print proxy.
   scoped_ptr<Callback2<bool, std::string>::Type> cloud_print_status_callback_;
+  scoped_ptr<GetChromotingHostStatusCallback> chromoting_host_status_callback_;
 
   // Handler for messages from service process.
   MessageHandler* message_handler_;
 
   NotificationRegistrar registrar_;
 };
 
 #endif  // CHROME_BROWSER_SERVICE_SERVICE_PROCESS_CONTROL_H_