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

Side by Side Diff: remoting/protocol/jingle_session_manager.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/jingle_session.h ('k') | remoting/protocol/protocol_test_client.cc » ('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_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 <string> 9 #include <string>
10 10
11 #include "base/lock.h"
12 #include "base/ref_counted.h" 11 #include "base/ref_counted.h"
13 #include "net/base/x509_certificate.h" 12 #include "net/base/x509_certificate.h"
14 #include "remoting/protocol/jingle_session.h" 13 #include "remoting/protocol/jingle_session.h"
15 #include "remoting/protocol/session_manager.h" 14 #include "remoting/protocol/session_manager.h"
16 #include "third_party/libjingle/source/talk/p2p/base/session.h" 15 #include "third_party/libjingle/source/talk/p2p/base/session.h"
17 #include "third_party/libjingle/source/talk/p2p/base/sessionclient.h" 16 #include "third_party/libjingle/source/talk/p2p/base/sessionclient.h"
18 #include "third_party/libjingle/source/talk/p2p/base/sessiondescription.h" 17 #include "third_party/libjingle/source/talk/p2p/base/sessiondescription.h"
19 18
20 class MessageLoop; 19 class MessageLoop;
21 20
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 scoped_ptr<base::RSAPrivateKey> private_key_; 150 scoped_ptr<base::RSAPrivateKey> private_key_;
152 151
153 DISALLOW_COPY_AND_ASSIGN(JingleSessionManager); 152 DISALLOW_COPY_AND_ASSIGN(JingleSessionManager);
154 }; 153 };
155 154
156 } // namespace protocol 155 } // namespace protocol
157 156
158 } // namespace remoting 157 } // namespace remoting
159 158
160 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_ 159 #endif // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
OLDNEW
« no previous file with comments | « remoting/protocol/jingle_session.h ('k') | remoting/protocol/protocol_test_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698