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

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

Issue 12760012: Rename EventExecutor to InputInjector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Replace some missed occurrences and remove unused include. Created 7 years, 9 months 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 <utility> 7 #include <utility>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/process_util.h" 12 #include "base/process_util.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "ipc/ipc_sender.h" 14 #include "ipc/ipc_sender.h"
15 #include "media/video/capture/screen/screen_capturer.h" 15 #include "media/video/capture/screen/screen_capturer.h"
16 #include "remoting/host/audio_capturer.h" 16 #include "remoting/host/audio_capturer.h"
17 #include "remoting/host/chromoting_messages.h" 17 #include "remoting/host/chromoting_messages.h"
18 #include "remoting/host/desktop_session.h" 18 #include "remoting/host/desktop_session.h"
19 #include "remoting/host/desktop_session_proxy.h" 19 #include "remoting/host/desktop_session_proxy.h"
20 #include "remoting/host/event_executor.h" 20 #include "remoting/host/input_injector.h"
21 #include "remoting/host/session_controller.h" 21 #include "remoting/host/session_controller.h"
22 22
23 namespace remoting { 23 namespace remoting {
24 24
25 IpcDesktopEnvironment::IpcDesktopEnvironment( 25 IpcDesktopEnvironment::IpcDesktopEnvironment(
26 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 26 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
27 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, 27 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
28 const std::string& client_jid, 28 const std::string& client_jid,
29 const base::Closure& disconnect_callback, 29 const base::Closure& disconnect_callback,
30 base::WeakPtr<DesktopSessionConnector> desktop_session_connector, 30 base::WeakPtr<DesktopSessionConnector> desktop_session_connector,
(...skipping 13 matching lines...) Expand all
44 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 44 DCHECK(caller_task_runner_->BelongsToCurrentThread());
45 } 45 }
46 46
47 scoped_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer( 47 scoped_ptr<AudioCapturer> IpcDesktopEnvironment::CreateAudioCapturer(
48 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner) { 48 scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner) {
49 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 49 DCHECK(caller_task_runner_->BelongsToCurrentThread());
50 50
51 return desktop_session_proxy_->CreateAudioCapturer(audio_task_runner); 51 return desktop_session_proxy_->CreateAudioCapturer(audio_task_runner);
52 } 52 }
53 53
54 scoped_ptr<EventExecutor> IpcDesktopEnvironment::CreateEventExecutor( 54 scoped_ptr<InputInjector> IpcDesktopEnvironment::CreateInputInjector(
55 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 55 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
56 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { 56 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
57 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 57 DCHECK(caller_task_runner_->BelongsToCurrentThread());
58 58
59 return desktop_session_proxy_->CreateEventExecutor(input_task_runner, 59 return desktop_session_proxy_->CreateInputInjector(input_task_runner,
60 ui_task_runner); 60 ui_task_runner);
61 } 61 }
62 62
63 scoped_ptr<SessionController> IpcDesktopEnvironment::CreateSessionController() { 63 scoped_ptr<SessionController> IpcDesktopEnvironment::CreateSessionController() {
64 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 64 DCHECK(caller_task_runner_->BelongsToCurrentThread());
65 65
66 return desktop_session_proxy_->CreateSessionController(); 66 return desktop_session_proxy_->CreateSessionController();
67 } 67 }
68 68
69 scoped_ptr<media::ScreenCapturer> IpcDesktopEnvironment::CreateVideoCapturer( 69 scoped_ptr<media::ScreenCapturer> IpcDesktopEnvironment::CreateVideoCapturer(
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 if (i != active_connections_.end()) { 203 if (i != active_connections_.end()) {
204 DesktopSessionProxy* desktop_session_proxy = i->second; 204 DesktopSessionProxy* desktop_session_proxy = i->second;
205 active_connections_.erase(i); 205 active_connections_.erase(i);
206 206
207 // Disconnect the client session. 207 // Disconnect the client session.
208 desktop_session_proxy->DisconnectSession(); 208 desktop_session_proxy->DisconnectSession();
209 } 209 }
210 } 210 }
211 211
212 } // namespace remoting 212 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/ipc_desktop_environment.h ('k') | remoting/host/ipc_desktop_environment_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698