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

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

Issue 12594009: Converted LocalInputMonitor into a SessionController instance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased 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
« no previous file with comments | « remoting/host/basic_desktop_environment.h ('k') | remoting/host/chromoting_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/basic_desktop_environment.h" 5 #include "remoting/host/basic_desktop_environment.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "media/video/capture/screen/screen_capturer.h" 9 #include "media/video/capture/screen/screen_capturer.h"
10 #include "remoting/host/audio_capturer.h" 10 #include "remoting/host/audio_capturer.h"
11 #include "remoting/host/client_session_control.h" 11 #include "remoting/host/client_session_control.h"
12 #include "remoting/host/input_injector.h" 12 #include "remoting/host/input_injector.h"
13 #include "remoting/host/local_input_monitor.h"
13 #include "remoting/host/screen_controls.h" 14 #include "remoting/host/screen_controls.h"
14 15
15 namespace remoting { 16 namespace remoting {
16 17
17 BasicDesktopEnvironment::~BasicDesktopEnvironment() { 18 BasicDesktopEnvironment::~BasicDesktopEnvironment() {
18 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 19 DCHECK(caller_task_runner_->BelongsToCurrentThread());
19 } 20 }
20 21
21 scoped_ptr<AudioCapturer> BasicDesktopEnvironment::CreateAudioCapturer() { 22 scoped_ptr<AudioCapturer> BasicDesktopEnvironment::CreateAudioCapturer() {
22 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 23 DCHECK(caller_task_runner_->BelongsToCurrentThread());
(...skipping 24 matching lines...) Expand all
47 48
48 BasicDesktopEnvironment::BasicDesktopEnvironment( 49 BasicDesktopEnvironment::BasicDesktopEnvironment(
49 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 50 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
50 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 51 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
51 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, 52 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
52 base::WeakPtr<ClientSessionControl> client_session_control) 53 base::WeakPtr<ClientSessionControl> client_session_control)
53 : caller_task_runner_(caller_task_runner), 54 : caller_task_runner_(caller_task_runner),
54 input_task_runner_(input_task_runner), 55 input_task_runner_(input_task_runner),
55 ui_task_runner_(ui_task_runner) { 56 ui_task_runner_(ui_task_runner) {
56 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 57 DCHECK(caller_task_runner_->BelongsToCurrentThread());
58
59 // Create the local input monitor.
60 local_input_monitor_ = LocalInputMonitor::Create(caller_task_runner_,
61 input_task_runner_,
62 ui_task_runner_,
63 client_session_control);
57 } 64 }
58 65
59 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory( 66 BasicDesktopEnvironmentFactory::BasicDesktopEnvironmentFactory(
60 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 67 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
61 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 68 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
62 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) 69 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
63 : caller_task_runner_(caller_task_runner), 70 : caller_task_runner_(caller_task_runner),
64 input_task_runner_(input_task_runner), 71 input_task_runner_(input_task_runner),
65 ui_task_runner_(ui_task_runner) { 72 ui_task_runner_(ui_task_runner) {
66 } 73 }
(...skipping 12 matching lines...) Expand all
79 client_session_control)); 86 client_session_control));
80 } 87 }
81 88
82 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { 89 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const {
83 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 90 DCHECK(caller_task_runner_->BelongsToCurrentThread());
84 91
85 return AudioCapturer::IsSupported(); 92 return AudioCapturer::IsSupported();
86 } 93 }
87 94
88 } // namespace remoting 95 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/basic_desktop_environment.h ('k') | remoting/host/chromoting_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698