| Index: remoting/host/chromoting_host.h
|
| diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
|
| index 73e844261369e041794abdf74af4d4bfa4b48d98..fe2c26fa60036caa53d33cf83119e3bd868671ee 100644
|
| --- a/remoting/host/chromoting_host.h
|
| +++ b/remoting/host/chromoting_host.h
|
| @@ -139,13 +139,14 @@ class ChromotingHost : public base::NonThreadSafe,
|
| protocol::Session* session,
|
| protocol::SessionManager::IncomingSessionResponse* response) OVERRIDE;
|
|
|
| + // Gets the candidate configuration for the protocol.
|
| + const protocol::CandidateSessionConfig* protocol_config() const {
|
| + return protocol_config_.get();
|
| + }
|
| +
|
| // Sets desired configuration for the protocol. Must be called before Start().
|
| void set_protocol_config(scoped_ptr<protocol::CandidateSessionConfig> config);
|
|
|
| - base::WeakPtr<ChromotingHost> AsWeakPtr() {
|
| - return weak_factory_.GetWeakPtr();
|
| - }
|
| -
|
| // 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 {
|
| @@ -156,6 +157,10 @@ class ChromotingHost : public base::NonThreadSafe,
|
| pairing_registry_ = pairing_registry;
|
| }
|
|
|
| + base::WeakPtr<ChromotingHost> AsWeakPtr() {
|
| + return weak_factory_.GetWeakPtr();
|
| + }
|
| +
|
| private:
|
| friend class ChromotingHostTest;
|
|
|
|
|