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

Unified Diff: remoting/protocol/pepper_session_manager.h

Issue 9005034: Refactor SignalStrategy so that it can be reused for multiple connections. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 8 years, 12 months 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 | « remoting/protocol/pepper_session.cc ('k') | remoting/protocol/pepper_session_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/pepper_session_manager.h
diff --git a/remoting/protocol/pepper_session_manager.h b/remoting/protocol/pepper_session_manager.h
index 3ae1823b66ab4a44d3ef6d53ead7a4f2dffdf235..54369bd3fd328891afb1898e4f63cfd77495190e 100644
--- a/remoting/protocol/pepper_session_manager.h
+++ b/remoting/protocol/pepper_session_manager.h
@@ -48,8 +48,7 @@ class PepperSessionManager : public SessionManager,
virtual ~PepperSessionManager();
// SessionManager interface.
- virtual void Init(const std::string& local_jid,
- SignalStrategy* signal_strategy,
+ virtual void Init(SignalStrategy* signal_strategy,
SessionManager::Listener* listener,
bool allow_nat_traversal) OVERRIDE;
virtual Session* Connect(
@@ -62,7 +61,10 @@ class PepperSessionManager : public SessionManager,
AuthenticatorFactory* authenticator_factory) OVERRIDE;
// SignalStrategy::Listener interface.
- virtual bool OnIncomingStanza(const buzz::XmlElement* stanza) OVERRIDE;
+ virtual void OnSignalStrategyStateChange(
+ SignalStrategy::State state) OVERRIDE;
+ virtual bool OnSignalStrategyIncomingStanza(
+ const buzz::XmlElement* stanza) OVERRIDE;
private:
friend class PepperSession;
@@ -83,13 +85,14 @@ class PepperSessionManager : public SessionManager,
pp::Instance* pp_instance_;
- std::string local_jid_;
SignalStrategy* signal_strategy_;
scoped_ptr<AuthenticatorFactory> authenticator_factory_;
scoped_ptr<IqSender> iq_sender_;
SessionManager::Listener* listener_;
bool allow_nat_traversal_;
+ bool ready_;
+
TransportConfig transport_config_;
scoped_ptr<JingleInfoRequest> jingle_info_request_;
« no previous file with comments | « remoting/protocol/pepper_session.cc ('k') | remoting/protocol/pepper_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698