Make AudioPlayer optional in ChromotingClient

remoting/client/chromoting_client.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.
 
 // ChromotingClient is the controller for the Client implementation.
 
 #ifndef REMOTING_CLIENT_CHROMOTING_CLIENT_H_
 #define REMOTING_CLIENT_CHROMOTING_CLIENT_H_
 
 #include <string>
@@ skipping 24 matching lines @@
 class ClientContext;
 class ClientUserInterface;
 class FrameConsumerProxy;
 class FrameProducer;
 class RectangleUpdateDecoder;
 class SignalStrategy;
 
 class ChromotingClient : public protocol::ConnectionToHost::HostEventCallback,
                          public protocol::ClientStub {
  public:
+  // A null pointer in |audio_player| disables the audio stream.

[Wez, 2013/07/09 20:08:07]

nit: We should have a comment here that clarifies the ClientContext etc object
lifetime requirements... for this CL, though, I'd suggest "|audio_player| may be
null, in which case audio will not be requested."

[solb, 2013/07/10 00:00:31]

Done.

   ChromotingClient(const ClientConfig& config,
                    ClientContext* client_context,
                    protocol::ConnectionToHost* connection,
                    ClientUserInterface* user_interface,
                    scoped_refptr<FrameConsumerProxy> frame_consumer,
                    scoped_ptr<AudioPlayer> audio_player);
 
   virtual ~ChromotingClient();
 
   // Start the client. Must be called on the main thread. |signal_strategy|
@@ skipping 57 matching lines @@
   // WeakPtr used to avoid tasks accessing the client after it is deleted.
   base::WeakPtrFactory<ChromotingClient> weak_factory_;
   base::WeakPtr<ChromotingClient> weak_ptr_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingClient);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_CHROMOTING_CLIENT_H_