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

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

Issue 390983003: Remove remoting/jingle_glue (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « remoting/signaling/xmpp_signal_strategy.h ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/jingle_glue/xmpp_signal_strategy.h" 5 #include "remoting/signaling/xmpp_signal_strategy.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/thread_task_runner_handle.h" 12 #include "base/thread_task_runner_handle.h"
13 #include "jingle/glue/chrome_async_socket.h" 13 #include "jingle/glue/chrome_async_socket.h"
14 #include "jingle/glue/task_pump.h" 14 #include "jingle/glue/task_pump.h"
15 #include "jingle/glue/xmpp_client_socket_factory.h" 15 #include "jingle/glue/xmpp_client_socket_factory.h"
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 std::string mechanism = notifier::kDefaultGaiaAuthMechanism; 242 std::string mechanism = notifier::kDefaultGaiaAuthMechanism;
243 if (settings.token_service() == "oauth2") { 243 if (settings.token_service() == "oauth2") {
244 mechanism = "X-OAUTH2"; 244 mechanism = "X-OAUTH2";
245 } 245 }
246 246
247 return new notifier::GaiaTokenPreXmppAuth( 247 return new notifier::GaiaTokenPreXmppAuth(
248 jid.Str(), settings.auth_token(), settings.token_service(), mechanism); 248 jid.Str(), settings.auth_token(), settings.token_service(), mechanism);
249 } 249 }
250 250
251 } // namespace remoting 251 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/signaling/xmpp_signal_strategy.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698