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

Side by Side Diff: remoting/host/win/session_desktop_environment_factory.cc

Issue 11364112: Merge 165565 - Calling SendSAS() from a service to make sure that Secure Attention Sequence can be … (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1312/src/
Patch Set: Created 8 years, 1 month 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/win/session_desktop_environment_factory.h" 5 #include "remoting/host/win/session_desktop_environment_factory.h"
6 6
7 #include "remoting/host/audio_capturer.h" 7 #include "remoting/host/audio_capturer.h"
8 #include "remoting/host/chromoting_host_context.h" 8 #include "remoting/host/chromoting_host_context.h"
9 #include "remoting/host/client_session.h" 9 #include "remoting/host/client_session.h"
10 #include "remoting/host/desktop_environment.h" 10 #include "remoting/host/desktop_environment.h"
11 #include "remoting/host/event_executor.h" 11 #include "remoting/host/event_executor.h"
12 #include "remoting/host/video_frame_capturer.h" 12 #include "remoting/host/video_frame_capturer.h"
13 #include "remoting/host/win/session_event_executor.h" 13 #include "remoting/host/win/session_event_executor.h"
14 14
15 namespace remoting { 15 namespace remoting {
16 16
17 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory( 17 SessionDesktopEnvironmentFactory::SessionDesktopEnvironmentFactory(
18 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 18 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
19 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) 19 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
20 : DesktopEnvironmentFactory(input_task_runner, ui_task_runner) { 20 const base::Closure& inject_sas)
21 : DesktopEnvironmentFactory(input_task_runner, ui_task_runner),
22 inject_sas_(inject_sas) {
21 } 23 }
22 24
23 SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() { 25 SessionDesktopEnvironmentFactory::~SessionDesktopEnvironmentFactory() {
24 } 26 }
25 27
26 scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create( 28 scoped_ptr<DesktopEnvironment> SessionDesktopEnvironmentFactory::Create(
27 ClientSession* client) { 29 ClientSession* client) {
28 scoped_ptr<AudioCapturer> audio_capturer = AudioCapturer::Create(); 30 scoped_ptr<AudioCapturer> audio_capturer = AudioCapturer::Create();
29 scoped_ptr<EventExecutor> event_executor = EventExecutor::Create( 31 scoped_ptr<EventExecutor> event_executor = EventExecutor::Create(
30 input_task_runner_, ui_task_runner_); 32 input_task_runner_, ui_task_runner_);
31 event_executor.reset(new SessionEventExecutorWin( 33 event_executor.reset(new SessionEventExecutorWin(
32 input_task_runner_, event_executor.Pass())); 34 input_task_runner_, event_executor.Pass(), ui_task_runner_, inject_sas_));
33 scoped_ptr<VideoFrameCapturer> video_capturer(VideoFrameCapturer::Create()); 35 scoped_ptr<VideoFrameCapturer> video_capturer(VideoFrameCapturer::Create());
34 return scoped_ptr<DesktopEnvironment>(new DesktopEnvironment( 36 return scoped_ptr<DesktopEnvironment>(new DesktopEnvironment(
35 audio_capturer.Pass(), 37 audio_capturer.Pass(),
36 event_executor.Pass(), 38 event_executor.Pass(),
37 video_capturer.Pass())); 39 video_capturer.Pass()));
38 } 40 }
39 41
40 } // namespace remoting 42 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/win/session_desktop_environment_factory.h ('k') | remoting/host/win/session_event_executor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698