Move screen capturers to remoting/capturer.

remoting/host/desktop_session_agent.cc

 // 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.
 
 #include "remoting/host/desktop_session_agent.h"
 
 #include "base/logging.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "remoting/base/auto_thread_task_runner.h"
-#include "remoting/base/capture_data.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/util.h"
+#include "remoting/capturer/capture_data.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/event_executor.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "third_party/skia/include/core/SkRegion.h"
 
 namespace remoting {
 
 namespace {
@@ skipping 132 matching lines @@
       capture_data->client_sequence_number();
   serialized_data.dpi = capture_data->dpi();
   for (SkRegion::Iterator i(capture_data->dirty_region()); !i.done(); i.next())
     serialized_data.dirty_region.push_back(i.rect());
 
   SendToNetwork(
       new ChromotingDesktopNetworkMsg_CaptureCompleted(serialized_data));
 }
 
 void DesktopSessionAgent::OnCursorShapeChanged(
-    scoped_ptr<protocol::CursorShapeInfo> cursor_shape) {
+    const MouseCursorShape& cursor_shape) {
   DCHECK(video_capture_task_runner()->BelongsToCurrentThread());
 
-  // Serialize |cursor_shape| to a string.
-  std::string serialized_cursor_shape;
-  if (!cursor_shape->SerializeToString(&serialized_cursor_shape)) {
-    LOG(ERROR) << "Failed to serialize protocol::CursorShapeInfo.";
-    return;
-  }
-
   SendToNetwork(new ChromotingDesktopNetworkMsg_CursorShapeChanged(
-      serialized_cursor_shape));
+      cursor_shape));
 }
 
 void DesktopSessionAgent::InjectClipboardEvent(
     const protocol::ClipboardEvent& event) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   std::string serialized_event;
   if (!event.SerializeToString(&serialized_event)) {
     LOG(ERROR) << "Failed to serialize protocol::ClipboardEvent.";
     return;
@@ skipping 214 matching lines @@
     scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner)
     : caller_task_runner_(caller_task_runner),
       input_task_runner_(input_task_runner),
       io_task_runner_(io_task_runner),
       video_capture_task_runner_(video_capture_task_runner),
       next_shared_buffer_id_(1) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 }
 
 }  // namespace remoting