Cleanups in ChromotingClient

remoting/protocol/connection_to_host.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_
 #define REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_
 
 #include <set>
 #include <string>
 
@@ skipping 62 matching lines @@
     // is set to false some data sent by the peers may be
     // delayed. This is used to indicate in the UI when connection is
     // temporarily broken.
     virtual void OnConnectionReady(bool ready) = 0;
 
     // Called when the route type (direct vs. STUN vs. proxied) changes.
     virtual void OnRouteChanged(const std::string& channel_name,
                                 const protocol::TransportRoute& route) = 0;
   };
 
-  ConnectionToHost(bool allow_nat_traversal);
+  ConnectionToHost();
   virtual ~ConnectionToHost();
 
   // Set the stubs which will handle messages from the host.
   // The caller must ensure that stubs out-live the connection.
   // Unless otherwise specified, all stubs must be set before Connect()
   // is called.
   void set_client_stub(ClientStub* client_stub);
   void set_clipboard_stub(ClipboardStub* clipboard_stub);
   void set_video_stub(VideoStub* video_stub);
   // If no audio stub is specified then audio will not be requested.
   void set_audio_stub(AudioStub* audio_stub);
 
   // Initiates a connection to the host specified by |host_jid|.
   // |signal_strategy| is used to signal to the host, and must outlive the
   // connection. Data channels will be negotiated over |transport_factory|.
   // |authenticator| will be used to authenticate the session and data channels.
   // |event_callback| will be notified of changes in the state of the connection
   // and must outlive the ConnectionToHost.
   // Caller must set stubs (see below) before calling Connect.
   virtual void Connect(SignalStrategy* signal_strategy,
                        scoped_ptr<TransportFactory> transport_factory,
                        scoped_ptr<Authenticator> authenticator,
                        const std::string& host_jid,
-                       const std::string& host_public_key,
                        HostEventCallback* event_callback);
 
   // Returns the session configuration that was negotiated with the host.
   virtual const SessionConfig& config();
 
   // Stubs for sending data to the host.
   virtual ClipboardStub* clipboard_forwarder();
   virtual HostStub* host_stub();
   virtual InputStub* input_stub();
 
@@ skipping 26 matching lines @@
 
   void NotifyIfChannelsReady();
 
   void CloseOnError(ErrorCode error);
 
   // Stops writing in the channels.
   void CloseChannels();
 
   void SetState(State state, ErrorCode error);
 
-  bool allow_nat_traversal_;
-
   std::string host_jid_;
   std::string host_public_key_;
   scoped_ptr<Authenticator> authenticator_;
 
   HostEventCallback* event_callback_;
 
   // Stub for incoming messages.
   ClientStub* client_stub_;
   ClipboardStub* clipboard_stub_;
   AudioStub* audio_stub_;
@@ skipping 15 matching lines @@
   ErrorCode error_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConnectionToHost);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_