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

Unified Diff: remoting/host/simple_host.cc

Issue 2724010: Revert 49298 - Broke compile - Token-based authentication for chromoting.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/simple_host.h ('k') | remoting/host/simple_host_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/simple_host.cc
===================================================================
--- remoting/host/simple_host.cc (revision 49299)
+++ remoting/host/simple_host.cc (working copy)
@@ -6,7 +6,6 @@
#include "base/stl_util-inl.h"
#include "build/build_config.h"
-#include "remoting/base/constants.h"
#include "remoting/base/protocol_decoder.h"
#include "remoting/host/session_manager.h"
#include "remoting/jingle_glue/jingle_channel.h"
@@ -14,14 +13,14 @@
namespace remoting {
SimpleHost::SimpleHost(const std::string& username,
- const std::string& auth_token,
+ const std::string& password,
Capturer* capturer,
Encoder* encoder,
EventExecutor* executor)
: capture_thread_("CaptureThread"),
encode_thread_("EncodeThread"),
username_(username),
- auth_token_(auth_token),
+ password_(password),
capturer_(capturer),
encoder_(encoder),
executor_(executor) {
@@ -60,8 +59,7 @@
// Connect to the talk network with a JingleClient.
jingle_client_ = new JingleClient();
- jingle_client_->Init(username_, auth_token_,
- kChromotingTokenServiceName, this);
+ jingle_client_->Init(username_, password_, this);
}
// This method is called if a client is connected to this object.
« no previous file with comments | « remoting/host/simple_host.h ('k') | remoting/host/simple_host_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698