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

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

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « remoting/protocol/buffered_socket_writer.cc ('k') | remoting/protocol/jingle_session_manager.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_H_ 5 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_H_
6 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_ 6 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
7 7
8 #include "base/crypto/rsa_private_key.h" 8 #include "base/crypto/rsa_private_key.h"
9 #include "base/lock.h"
10 #include "base/ref_counted.h" 9 #include "base/ref_counted.h"
11 #include "net/base/completion_callback.h" 10 #include "net/base/completion_callback.h"
12 #include "remoting/protocol/session.h" 11 #include "remoting/protocol/session.h"
13 #include "third_party/libjingle/source/talk/base/sigslot.h" 12 #include "third_party/libjingle/source/talk/base/sigslot.h"
14 #include "third_party/libjingle/source/talk/p2p/base/session.h" 13 #include "third_party/libjingle/source/talk/p2p/base/session.h"
15 14
16 namespace cricket { 15 namespace cricket {
17 class PseudoTcpChannel; 16 class PseudoTcpChannel;
18 } // namespace cricket 17 } // namespace cricket
19 18
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 scoped_ptr<net::CompletionCallback> connect_callback_; 173 scoped_ptr<net::CompletionCallback> connect_callback_;
175 174
176 DISALLOW_COPY_AND_ASSIGN(JingleSession); 175 DISALLOW_COPY_AND_ASSIGN(JingleSession);
177 }; 176 };
178 177
179 } // namespace protocol 178 } // namespace protocol
180 179
181 } // namespace remoting 180 } // namespace remoting
182 181
183 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_H_ 182 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_H_
OLDNEW
« no previous file with comments | « remoting/protocol/buffered_socket_writer.cc ('k') | remoting/protocol/jingle_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698