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

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

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <limits> 5 #include <limits>
6 6
7 #include "remoting/protocol/jingle_session_manager.h" 7 #include "remoting/protocol/jingle_session_manager.h"
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 cricket_session_manager_(NULL), 171 cricket_session_manager_(NULL),
172 allow_local_ips_(false), 172 allow_local_ips_(false),
173 closed_(false) { 173 closed_(false) {
174 DCHECK(jingle_thread_); 174 DCHECK(jingle_thread_);
175 } 175 }
176 176
177 void JingleSessionManager::Init( 177 void JingleSessionManager::Init(
178 const std::string& local_jid, 178 const std::string& local_jid,
179 cricket::SessionManager* cricket_session_manager, 179 cricket::SessionManager* cricket_session_manager,
180 IncomingSessionCallback* incoming_session_callback, 180 IncomingSessionCallback* incoming_session_callback,
181 base::RSAPrivateKey* private_key, 181 crypto::RSAPrivateKey* private_key,
182 scoped_refptr<net::X509Certificate> certificate) { 182 scoped_refptr<net::X509Certificate> certificate) {
183 if (MessageLoop::current() != message_loop()) { 183 if (MessageLoop::current() != message_loop()) {
184 message_loop()->PostTask( 184 message_loop()->PostTask(
185 FROM_HERE, NewRunnableMethod( 185 FROM_HERE, NewRunnableMethod(
186 this, &JingleSessionManager::Init, 186 this, &JingleSessionManager::Init,
187 local_jid, cricket_session_manager, incoming_session_callback, 187 local_jid, cricket_session_manager, incoming_session_callback,
188 private_key, certificate)); 188 private_key, certificate));
189 return; 189 return;
190 } 190 }
191 191
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 scoped_refptr<net::X509Certificate> certificate) { 540 scoped_refptr<net::X509Certificate> certificate) {
541 cricket::SessionDescription* desc = new cricket::SessionDescription(); 541 cricket::SessionDescription* desc = new cricket::SessionDescription();
542 desc->AddContent(JingleSession::kChromotingContentName, 542 desc->AddContent(JingleSession::kChromotingContentName,
543 kChromotingXmlNamespace, 543 kChromotingXmlNamespace,
544 new ContentDescription(config, auth_token, certificate)); 544 new ContentDescription(config, auth_token, certificate));
545 return desc; 545 return desc;
546 } 546 }
547 547
548 } // namespace protocol 548 } // namespace protocol
549 } // namespace remoting 549 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/jingle_session_manager.h ('k') | remoting/protocol/jingle_session_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698