Chromium Code Reviews| 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 738f11e1a0c610c730ddd1d5ce9cb90edbd88036..18104b8e356198f072df4b744e42e720e15c4830 100644 |
| --- a/remoting/client/jni/chromoting_jni_instance.h |
| +++ b/remoting/client/jni/chromoting_jni_instance.h |
| @@ -2,8 +2,8 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_ |
| -#define REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_ |
| +#ifndef REMOTING_CLIENT_JNI_CHROMOTING_JNI_INSTANCE_H_ |
| +#define REMOTING_CLIENT_JNI_CHROMOTING_JNI_INSTANCE_H_ |
| #include <memory> |
| #include <string> |
| @@ -30,6 +30,7 @@ class PerformanceTracker; |
| class VideoRenderer; |
| } // namespace protocol |
| +class AudioPlayerAndroid; |
| class ChromotingJniRuntime; |
| class JniClient; |
| class JniDisplayHandler; |
| @@ -179,6 +180,8 @@ class ChromotingJniInstance |
| std::unique_ptr<XmppSignalStrategy> signaling_; // Must outlive client_ |
| protocol::ThirdPartyTokenFetchedCallback third_party_token_fetched_callback_; |
| + std::unique_ptr<AudioPlayerAndroid> audio_player_; |
|
nicholss
2016/06/09 17:26:39
So the large change here is that now the chromotin
Lambros
2016/06/09 19:01:05
I'm not sure about this. What happens after Chromo
nicholss
2016/06/09 19:46:30
For that to happen the chromoting client instance
Sergey Ulanov
2016/06/09 20:23:45
This may be acceptable, but it is error prone. It'
|
| + |
| // Indicates whether to establish a new pairing with this host. This is |
| // modified in ProvideSecret(), but thereafter to be used only from the |
| // network thread. (This is safe because ProvideSecret() is invoked at most |
| @@ -209,4 +212,4 @@ class ChromotingJniInstance |
| } // namespace remoting |
| -#endif |
| +#endif // REMOTING_CLIENT_JNI_CHROMOTING_JNI_INSTANCE_H_ |