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

Side by Side Diff: jingle/notifier/base/ssl_adapter.cc

Issue 2885005: Move chrome/common/net/notifier to jingle/notifier so that it can be used by remoting/remoting.gyp. (Closed) Base URL: git://codf21.jail.google.com/chromium.git
Patch Set: rebased Created 10 years, 5 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 | « jingle/notifier/base/ssl_adapter.h ('k') | jingle/notifier/base/static_assert.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "chrome/common/net/notifier/base/ssl_adapter.h" 5 #include "jingle/notifier/base/ssl_adapter.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include "talk/base/ssladapter.h" 8 #include "talk/base/ssladapter.h"
9 #else 9 #else
10 #include "chrome/common/net/notifier/communicator/ssl_socket_adapter.h" 10 #include "jingle/notifier/communicator/ssl_socket_adapter.h"
11 #endif 11 #endif
12 12
13 namespace notifier { 13 namespace notifier {
14 14
15 talk_base::SSLAdapter* CreateSSLAdapter(talk_base::AsyncSocket* socket) { 15 talk_base::SSLAdapter* CreateSSLAdapter(talk_base::AsyncSocket* socket) {
16 talk_base::SSLAdapter* ssl_adapter = 16 talk_base::SSLAdapter* ssl_adapter =
17 #if defined(OS_WIN) 17 #if defined(OS_WIN)
18 talk_base::SSLAdapter::Create(socket); 18 talk_base::SSLAdapter::Create(socket);
19 #else 19 #else
20 notifier::SSLSocketAdapter::Create(socket); 20 notifier::SSLSocketAdapter::Create(socket);
21 #endif 21 #endif
22 DCHECK(ssl_adapter); 22 DCHECK(ssl_adapter);
23 return ssl_adapter; 23 return ssl_adapter;
24 } 24 }
25 25
26 } // namespace notifier 26 } // namespace notifier
27 27
OLDNEW
« no previous file with comments | « jingle/notifier/base/ssl_adapter.h ('k') | jingle/notifier/base/static_assert.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698