Chromium Code Reviews| Index: remoting/client/jni/chromoting_jni_instance.cc |
| diff --git a/remoting/client/jni/chromoting_jni_instance.cc b/remoting/client/jni/chromoting_jni_instance.cc |
| index 8430afc84d25ab5d3326af51eccfd5066cc7fb64..19c78047e2cd5edea02bdb8bca21efa3c1b77c8c 100644 |
| --- a/remoting/client/jni/chromoting_jni_instance.cc |
| +++ b/remoting/client/jni/chromoting_jni_instance.cc |
| @@ -408,6 +408,7 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() { |
| protocol::NetworkSettings::NAT_TRAVERSAL_FULL), |
| protocol::TransportRole::CLIENT); |
| +#if !defined(DISABLE_WEBRTC) |
| if (flags_.find("useWebrtc") != std::string::npos) { |
| VLOG(0) << "Attempting to connect using WebRTC."; |
| scoped_ptr<protocol::CandidateSessionConfig> protocol_config = |
| @@ -416,7 +417,7 @@ void ChromotingJniInstance::ConnectToHostOnNetworkThread() { |
| protocol_config->set_ice_supported(false); |
| client_->set_protocol_config(std::move(protocol_config)); |
| } |
| - |
| +#endif // if !defined(DISABLE_WEBRTC) |
|
Sergey Ulanov
2016/03/16 19:12:36
don't need 'if'.
two spaces before // please
Yuwei
2016/03/16 21:21:00
Done.
|
| client_->Start(signaling_.get(), client_auth_config_, transport_context, |
| host_jid_, capabilities_); |
| } |