Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Side by Side Diff: remoting/host/ipc_desktop_environment.cc

Issue 11470028: Move screen capturers to remoting/capturer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/ipc_desktop_environment.h" 5 #include "remoting/host/ipc_desktop_environment.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/platform_file.h" 9 #include "base/platform_file.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "ipc/ipc_channel_proxy.h" 11 #include "ipc/ipc_channel_proxy.h"
12 #include "ipc/ipc_message_macros.h" 12 #include "ipc/ipc_message_macros.h"
13 #include "remoting/base/capture_data.h" 13 #include "remoting/capturer/capture_data.h"
14 #include "remoting/capturer/video_frame_capturer.h"
14 #include "remoting/host/audio_capturer.h" 15 #include "remoting/host/audio_capturer.h"
15 #include "remoting/host/chromoting_messages.h" 16 #include "remoting/host/chromoting_messages.h"
16 #include "remoting/host/client_session.h" 17 #include "remoting/host/client_session.h"
17 #include "remoting/host/desktop_session_connector.h" 18 #include "remoting/host/desktop_session_connector.h"
18 #include "remoting/host/desktop_session_proxy.h" 19 #include "remoting/host/desktop_session_proxy.h"
19 #include "remoting/host/event_executor.h" 20 #include "remoting/host/event_executor.h"
20 #include "remoting/host/ipc_event_executor.h" 21 #include "remoting/host/ipc_event_executor.h"
21 #include "remoting/host/ipc_video_frame_capturer.h" 22 #include "remoting/host/ipc_video_frame_capturer.h"
22 #include "remoting/host/video_frame_capturer.h"
23 23
24 #if defined(OS_WIN) 24 #if defined(OS_WIN)
25 #include "base/win/scoped_handle.h" 25 #include "base/win/scoped_handle.h"
26 #endif // defined(OS_WIN) 26 #endif // defined(OS_WIN)
27 27
28 namespace remoting { 28 namespace remoting {
29 29
30 IpcDesktopEnvironment::IpcDesktopEnvironment( 30 IpcDesktopEnvironment::IpcDesktopEnvironment(
31 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 31 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
32 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner, 32 scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 void IpcDesktopEnvironment::OnDesktopSessionAgentAttached( 74 void IpcDesktopEnvironment::OnDesktopSessionAgentAttached(
75 IPC::PlatformFileForTransit desktop_process, 75 IPC::PlatformFileForTransit desktop_process,
76 IPC::PlatformFileForTransit desktop_pipe) { 76 IPC::PlatformFileForTransit desktop_pipe) {
77 DCHECK(network_task_runner_->BelongsToCurrentThread()); 77 DCHECK(network_task_runner_->BelongsToCurrentThread());
78 78
79 desktop_session_proxy_->Disconnect(); 79 desktop_session_proxy_->Disconnect();
80 desktop_session_proxy_->Connect(desktop_process, desktop_pipe); 80 desktop_session_proxy_->Connect(desktop_process, desktop_pipe);
81 } 81 }
82 82
83 } // namespace remoting 83 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698