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

Side by Side Diff: remoting/signaling/xmpp_signal_strategy.cc

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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/signaling/fake_signal_strategy.h ('k') | remoting/test/test_chromoting_client.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "remoting/signaling/xmpp_signal_strategy.h" 5 #include "remoting/signaling/xmpp_signal_strategy.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 scoped_refptr<net::IOBuffer> read_buffer_; 105 scoped_refptr<net::IOBuffer> read_buffer_;
106 bool read_pending_; 106 bool read_pending_;
107 bool tls_pending_; 107 bool tls_pending_;
108 108
109 scoped_ptr<XmppLoginHandler> login_handler_; 109 scoped_ptr<XmppLoginHandler> login_handler_;
110 scoped_ptr<XmppStreamParser> stream_parser_; 110 scoped_ptr<XmppStreamParser> stream_parser_;
111 std::string jid_; 111 std::string jid_;
112 112
113 Error error_; 113 Error error_;
114 114
115 ObserverList<Listener, true> listeners_; 115 base::ObserverList<Listener, true> listeners_;
116 116
117 base::Timer keep_alive_timer_; 117 base::Timer keep_alive_timer_;
118 118
119 base::ThreadChecker thread_checker_; 119 base::ThreadChecker thread_checker_;
120 120
121 DISALLOW_COPY_AND_ASSIGN(Core); 121 DISALLOW_COPY_AND_ASSIGN(Core);
122 }; 122 };
123 123
124 XmppSignalStrategy::Core::Core( 124 XmppSignalStrategy::Core::Core(
125 net::ClientSocketFactory* socket_factory, 125 net::ClientSocketFactory* socket_factory,
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 std::string XmppSignalStrategy::GetNextId() { 490 std::string XmppSignalStrategy::GetNextId() {
491 return base::Uint64ToString(base::RandUint64()); 491 return base::Uint64ToString(base::RandUint64());
492 } 492 }
493 493
494 void XmppSignalStrategy::SetAuthInfo(const std::string& username, 494 void XmppSignalStrategy::SetAuthInfo(const std::string& username,
495 const std::string& auth_token) { 495 const std::string& auth_token) {
496 core_->SetAuthInfo(username, auth_token); 496 core_->SetAuthInfo(username, auth_token);
497 } 497 }
498 498
499 } // namespace remoting 499 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/signaling/fake_signal_strategy.h ('k') | remoting/test/test_chromoting_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698