| Index: remoting/protocol/jingle_session.h
|
| diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
|
| index 189cb53c45fb2cabb4af82159c7cba4507942390..3b704fb359b91272bc3123429739f1ebfe6aaae6 100644
|
| --- a/remoting/protocol/jingle_session.h
|
| +++ b/remoting/protocol/jingle_session.h
|
| @@ -132,9 +132,13 @@ class JingleSession : public Session,
|
|
|
| // Called after the initial incoming authenticator message is processed.
|
| void ContinueAcceptIncomingConnection();
|
| +
|
| // Called after subsequent authenticator messages are processed.
|
| void ProcessAuthenticationStep();
|
|
|
| + // Called after the authenticating step is finished.
|
| + void ContinueAuthenticationStep();
|
| +
|
| // Terminates the session and sends session-terminate if it is
|
| // necessary. |error| specifies the error code in case when the
|
| // session is being closed due to an error.
|
| @@ -143,6 +147,9 @@ class JingleSession : public Session,
|
| // Sets |state_| to |new_state| and calls state change callback.
|
| void SetState(State new_state);
|
|
|
| + // Returns true if the state of the session is not CLOSED or FAILED
|
| + bool is_session_active();
|
| +
|
| JingleSessionManager* session_manager_;
|
| std::string peer_jid_;
|
| scoped_ptr<CandidateSessionConfig> candidate_config_;
|
| @@ -172,6 +179,8 @@ class JingleSession : public Session,
|
| // Pending remote candidates, received before the local channels were created.
|
| std::list<JingleMessage::NamedCandidate> pending_remote_candidates_;
|
|
|
| + base::WeakPtrFactory<JingleSession> weak_factory_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(JingleSession);
|
| };
|
|
|
|
|