More cleanups in JingleSessionManager interface.

remoting/host/chromoting_host.h

 // Copyright (c) 2012 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 REMOTING_HOST_CHROMOTING_HOST_H_
 #define REMOTING_HOST_CHROMOTING_HOST_H_
 
 #include <list>
 #include <string>
 
@@ skipping 44 matching lines @@
 //    After we have done all the initialization we'll start the ScreenRecorder.
 //    We'll then enter the running state of the host process.
 //
 // 3. When the user is disconnected, we will pause the ScreenRecorder
 //    and try to terminate the threads we have created. This will allow
 //    all pending tasks to complete. After all of that completed we
 //    return to the idle state. We then go to step (2) if there a new
 //    incoming connection.
 class ChromotingHost : public base::NonThreadSafe,
                        public ClientSession::EventHandler,
-                       public protocol::SessionManager::Listener,
                        public HostStatusMonitor {
  public:
-  // Both |signal_strategy| and |desktop_environment_factory| should outlive
-  // this object.
+  // |desktop_environment_factory| must outlive this object.
   ChromotingHost(
-      SignalStrategy* signal_strategy,
       DesktopEnvironmentFactory* desktop_environment_factory,
       scoped_ptr<protocol::SessionManager> session_manager,
       scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
   ~ChromotingHost() override;
 
@@ skipping 33 matching lines @@
   // ClientSession::EventHandler implementation.
   void OnSessionAuthenticating(ClientSession* client) override;
   void OnSessionAuthenticated(ClientSession* client) override;
   void OnSessionChannelsConnected(ClientSession* client) override;
   void OnSessionAuthenticationFailed(ClientSession* client) override;
   void OnSessionClosed(ClientSession* session) override;
   void OnSessionRouteChange(ClientSession* session,
                             const std::string& channel_name,
                             const protocol::TransportRoute& route) override;
 
-  // SessionManager::Listener implementation.
+  // Callback for SessionManager to accept incoming sessions.
   void OnIncomingSession(
       protocol::Session* session,
-      protocol::SessionManager::IncomingSessionResponse* response) override;
+      protocol::SessionManager::IncomingSessionResponse* response);
 
   // The host uses a pairing registry to generate and store pairing information
   // for clients for PIN-less authentication.
   scoped_refptr<protocol::PairingRegistry> pairing_registry() const {
     return pairing_registry_;
   }
   void set_pairing_registry(
       scoped_refptr<protocol::PairingRegistry> pairing_registry) {
     pairing_registry_ = pairing_registry;
   }
@@ skipping 19 matching lines @@
   // Parameters specified when the host was created.
   DesktopEnvironmentFactory* desktop_environment_factory_;
   scoped_ptr<protocol::SessionManager> session_manager_;
   scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> input_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> video_encode_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
 
-  // Connection objects.
-  SignalStrategy* signal_strategy_;
-
   // Must be used on the network thread only.
   base::ObserverList<HostStatusObserver> status_observers_;
 
   // The connections to remote clients.
   ClientList clients_;
 
   // True if the host has been started.
   bool started_;
 
   // Login backoff state.
@@ skipping 12 matching lines @@
   HostExtensionList extensions_;
 
   base::WeakPtrFactory<ChromotingHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_