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

Unified Diff: remoting/client/jni/chromoting_jni_instance.h

Issue 1778023002: Move NegotiatingClientAuthentication creation to ChromotingClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/client/chromoting_client.cc ('k') | remoting/client/jni/chromoting_jni_instance.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/jni/chromoting_jni_instance.h
diff --git a/remoting/client/jni/chromoting_jni_instance.h b/remoting/client/jni/chromoting_jni_instance.h
index 9eab8d974cfe543ac7b8c47827be3009695c2171..ae2c862626e3d8492f770a0cc6f54486bd1b9916 100644
--- a/remoting/client/jni/chromoting_jni_instance.h
+++ b/remoting/client/jni/chromoting_jni_instance.h
@@ -147,9 +147,10 @@ class ChromotingJniInstance
ChromotingJniRuntime* jni_runtime_;
// ID of the host we are connecting to.
- std::string host_id_;
std::string host_jid_;
+ protocol::ClientAuthenticationConfig client_auth_config_;
+
std::string flags_;
// This group of variables is to be used on the network thread.
@@ -157,7 +158,6 @@ class ChromotingJniInstance
scoped_ptr<protocol::PerformanceTracker> perf_tracker_;
scoped_ptr<JniFrameConsumer> view_;
scoped_ptr<protocol::VideoRenderer> video_renderer_;
- scoped_ptr<protocol::Authenticator> authenticator_;
scoped_ptr<ChromotingClient> client_;
XmppSignalStrategy::XmppServerConfig xmpp_config_;
scoped_ptr<XmppSignalStrategy> signaling_; // Must outlive client_
@@ -172,7 +172,7 @@ class ChromotingJniInstance
// modified in ProvideSecret(), but thereafter to be used only from the
// network thread. (This is safe because ProvideSecret() is invoked at most
// once per run, and always before any reference to this flag.)
- bool create_pairing_;
+ bool create_pairing_ = false;
// The device name to appear in the paired-clients list. Accessed on the
// network thread.
@@ -180,7 +180,7 @@ class ChromotingJniInstance
// If this is true, performance statistics will be periodically written to
// the Android log. Used on the network thread.
- bool stats_logging_enabled_;
+ bool stats_logging_enabled_ = false;
// The set of capabilities supported by the client. Accessed on the network
// thread. Once SetCapabilities() is called, this will contain the negotiated
« no previous file with comments | « remoting/client/chromoting_client.cc ('k') | remoting/client/jni/chromoting_jni_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698