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

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

Issue 15692018: Remove screen capturers from media/video/capture/screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/video_scheduler_unittest.cc ('k') | remoting/host/win/session_input_injector.cc » ('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/win/session_desktop_environment.h" 5 #include "remoting/host/win/session_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"
10 #include "remoting/host/audio_capturer.h" 9 #include "remoting/host/audio_capturer.h"
11 #include "remoting/host/input_injector.h" 10 #include "remoting/host/input_injector.h"
12 #include "remoting/host/screen_controls.h" 11 #include "remoting/host/screen_controls.h"
13 #include "remoting/host/win/session_input_injector.h" 12 #include "remoting/host/win/session_input_injector.h"
13 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
14 14
15 namespace remoting { 15 namespace remoting {
16 16
17 SessionDesktopEnvironment::~SessionDesktopEnvironment() { 17 SessionDesktopEnvironment::~SessionDesktopEnvironment() {
18 } 18 }
19 19
20 scoped_ptr<InputInjector> SessionDesktopEnvironment::CreateInputInjector() { 20 scoped_ptr<InputInjector> SessionDesktopEnvironment::CreateInputInjector() {
21 DCHECK(caller_task_runner()->BelongsToCurrentThread()); 21 DCHECK(caller_task_runner()->BelongsToCurrentThread());
22 22
23 scoped_ptr<InputInjector> input_injector = InputInjector::Create( 23 scoped_ptr<InputInjector> input_injector = InputInjector::Create(
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 if (!desktop_environment->InitializeSecurity(client_session_control, 69 if (!desktop_environment->InitializeSecurity(client_session_control,
70 ui_strings(), 70 ui_strings(),
71 curtain_enabled())) { 71 curtain_enabled())) {
72 return scoped_ptr<DesktopEnvironment>(); 72 return scoped_ptr<DesktopEnvironment>();
73 } 73 }
74 74
75 return desktop_environment.PassAs<DesktopEnvironment>(); 75 return desktop_environment.PassAs<DesktopEnvironment>();
76 } 76 }
77 77
78 } // namespace remoting 78 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/video_scheduler_unittest.cc ('k') | remoting/host/win/session_input_injector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698