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

Side by Side Diff: remoting/protocol/jingle_session_manager.h

Issue 628753002: replace OVERRIDE and FINAL with override and final in remoting/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « remoting/protocol/jingle_session.h ('k') | remoting/protocol/libjingle_transport_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_ 5 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
6 #define REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_ 6 #define REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 30 matching lines...) Expand all
41 // the protocol::SessionManager interface for accepting incoming and 41 // the protocol::SessionManager interface for accepting incoming and
42 // creating outgoing sessions. 42 // creating outgoing sessions.
43 class JingleSessionManager : public SessionManager, 43 class JingleSessionManager : public SessionManager,
44 public SignalStrategy::Listener { 44 public SignalStrategy::Listener {
45 public: 45 public:
46 explicit JingleSessionManager(scoped_ptr<TransportFactory> transport_factory); 46 explicit JingleSessionManager(scoped_ptr<TransportFactory> transport_factory);
47 virtual ~JingleSessionManager(); 47 virtual ~JingleSessionManager();
48 48
49 // SessionManager interface. 49 // SessionManager interface.
50 virtual void Init(SignalStrategy* signal_strategy, 50 virtual void Init(SignalStrategy* signal_strategy,
51 SessionManager::Listener* listener) OVERRIDE; 51 SessionManager::Listener* listener) override;
52 virtual scoped_ptr<Session> Connect( 52 virtual scoped_ptr<Session> Connect(
53 const std::string& host_jid, 53 const std::string& host_jid,
54 scoped_ptr<Authenticator> authenticator, 54 scoped_ptr<Authenticator> authenticator,
55 scoped_ptr<CandidateSessionConfig> config) OVERRIDE; 55 scoped_ptr<CandidateSessionConfig> config) override;
56 virtual void Close() OVERRIDE; 56 virtual void Close() override;
57 virtual void set_authenticator_factory( 57 virtual void set_authenticator_factory(
58 scoped_ptr<AuthenticatorFactory> authenticator_factory) OVERRIDE; 58 scoped_ptr<AuthenticatorFactory> authenticator_factory) override;
59 59
60 // SignalStrategy::Listener interface. 60 // SignalStrategy::Listener interface.
61 virtual void OnSignalStrategyStateChange( 61 virtual void OnSignalStrategyStateChange(
62 SignalStrategy::State state) OVERRIDE; 62 SignalStrategy::State state) override;
63 virtual bool OnSignalStrategyIncomingStanza( 63 virtual bool OnSignalStrategyIncomingStanza(
64 const buzz::XmlElement* stanza) OVERRIDE; 64 const buzz::XmlElement* stanza) override;
65 65
66 private: 66 private:
67 friend class JingleSession; 67 friend class JingleSession;
68 68
69 typedef std::map<std::string, JingleSession*> SessionsMap; 69 typedef std::map<std::string, JingleSession*> SessionsMap;
70 70
71 void OnJingleInfo( 71 void OnJingleInfo(
72 const std::string& relay_token, 72 const std::string& relay_token,
73 const std::vector<std::string>& relay_hosts, 73 const std::vector<std::string>& relay_hosts,
74 const std::vector<rtc::SocketAddress>& stun_hosts); 74 const std::vector<rtc::SocketAddress>& stun_hosts);
(...skipping 17 matching lines...) Expand all
92 92
93 SessionsMap sessions_; 93 SessionsMap sessions_;
94 94
95 DISALLOW_COPY_AND_ASSIGN(JingleSessionManager); 95 DISALLOW_COPY_AND_ASSIGN(JingleSessionManager);
96 }; 96 };
97 97
98 } // namespace protocol 98 } // namespace protocol
99 } // namespace remoting 99 } // namespace remoting
100 100
101 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_ 101 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
OLDNEW
« no previous file with comments | « remoting/protocol/jingle_session.h ('k') | remoting/protocol/libjingle_transport_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698