Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(297)

Unified Diff: remoting/host/chromoting_host.h

Issue 1530523002: More cleanups in JingleSessionManager interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@transport_context
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/host/chromoting_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_host.h
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index a0a4df17dc8e643b2083ec7a5ca301fd9d3da66e..d18e7d8612b86da49ca19357c59e2021ae8a0789 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -62,13 +62,10 @@ class DesktopEnvironmentFactory;
// 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,
@@ -122,10 +119,10 @@ class ChromotingHost : public base::NonThreadSafe,
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.
@@ -165,9 +162,6 @@ class ChromotingHost : public base::NonThreadSafe,
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_;
« no previous file with comments | « no previous file | remoting/host/chromoting_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698