Replace VideoStream::SizeCallback with VideoStream::Observer interface.

remoting/host/client_session.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_HOST_CLIENT_SESSION_H_
 #define REMOTING_HOST_CLIENT_SESSION_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 11 matching lines @@
 #include "remoting/protocol/clipboard_echo_filter.h"
 #include "remoting/protocol/clipboard_filter.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/input_event_tracker.h"
 #include "remoting/protocol/input_filter.h"
 #include "remoting/protocol/input_stub.h"
 #include "remoting/protocol/mouse_input_filter.h"
 #include "remoting/protocol/pairing_registry.h"
+#include "remoting/protocol/video_stream.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace remoting {
 
 class AudioPump;
 class DesktopEnvironment;
 class DesktopEnvironmentFactory;
 class InputInjector;
 class MouseShapePump;
 class ScreenControls;
 
 namespace protocol {
 class VideoLayout;
 }  // namespace protocol
 
 // A ClientSession keeps a reference to a connection to a client, and maintains
 // per-client state.
 class ClientSession : public base::NonThreadSafe,
                       public protocol::HostStub,
                       public protocol::ConnectionToClient::EventHandler,
+                      public protocol::VideoStream::Observer,
                       public ClientSessionControl {
  public:
   // Callback interface for passing events to the ChromotingHost.
   class EventHandler {
    public:
     // Called after authentication has started.
     virtual void OnSessionAuthenticating(ClientSession* client) = 0;
 
     // Called after authentication has finished successfully.
     virtual void OnSessionAuthenticated(ClientSession* client) = 0;
@@ skipping 71 matching lines @@
   bool is_authenticated() { return is_authenticated_; }
 
   const std::string* client_capabilities() const {
     return client_capabilities_.get();
   }
 
  private:
   // Creates a proxy for sending clipboard events to the client.
   std::unique_ptr<protocol::ClipboardStub> CreateClipboardProxy();
 
-  void OnScreenSizeChanged(const webrtc::DesktopSize& size,
-                           const webrtc::DesktopVector& dpi);
+  // protocol::VideoStream::Observer implementation.
+  void OnVideoSizeChanged(protocol::VideoStream* stream,
+                          const webrtc::DesktopSize& size,
+                          const webrtc::DesktopVector& dpi) override;
+  void OnVideoFrameSent(protocol::VideoStream* stream,
+                        uint32_t frame_id,
+                        int64_t input_event_timestamp) override;
 
   EventHandler* event_handler_;
 
   // The connection to the client.
   std::unique_ptr<protocol::ConnectionToClient> connection_;
 
   std::string client_jid_;
 
   // Used to create a DesktopEnvironment instance for this session.
   DesktopEnvironmentFactory* desktop_environment_factory_;
@@ skipping 81 matching lines @@
   // Used to disable callbacks to |this| once DisconnectSession() has been
   // called.
   base::WeakPtrFactory<ClientSessionControl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSession);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CLIENT_SESSION_H_