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

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

Issue 686373002: Revert of Remote assistance on Chrome OS Part IV - It2MeHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « remoting/host/DEPS ('k') | remoting/host/chromeos/aura_desktop_capturer.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/basic_desktop_environment.h" 5 #include "remoting/host/basic_desktop_environment.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "remoting/host/audio_capturer.h" 10 #include "remoting/host/audio_capturer.h"
11 #if defined(OS_CHROMEOS)
12 #include "remoting/host/chromeos/aura_desktop_capturer.h"
13 #endif
14 #include "remoting/host/client_session_control.h" 11 #include "remoting/host/client_session_control.h"
15 #include "remoting/host/gnubby_auth_handler.h" 12 #include "remoting/host/gnubby_auth_handler.h"
16 #include "remoting/host/input_injector.h" 13 #include "remoting/host/input_injector.h"
17 #include "remoting/host/screen_controls.h" 14 #include "remoting/host/screen_controls.h"
18 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" 15 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
19 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h" 16 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
20 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" 17 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
21 18
22 namespace remoting { 19 namespace remoting {
23 20
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 55
59 scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler( 56 scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler(
60 protocol::ClientStub* client_stub) { 57 protocol::ClientStub* client_stub) {
61 return nullptr; 58 return nullptr;
62 } 59 }
63 60
64 scoped_ptr<webrtc::DesktopCapturer> 61 scoped_ptr<webrtc::DesktopCapturer>
65 BasicDesktopEnvironment::CreateVideoCapturer() { 62 BasicDesktopEnvironment::CreateVideoCapturer() {
66 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 63 DCHECK(caller_task_runner_->BelongsToCurrentThread());
67 64
68 #if defined(OS_CHROMEOS)
69 return scoped_ptr<webrtc::DesktopCapturer>(new AuraDesktopCapturer());
70 #else // !defined(OS_CHROMEOS)
71 // The basic desktop environment does not use X DAMAGE, since it is 65 // The basic desktop environment does not use X DAMAGE, since it is
72 // broken on many systems - see http://crbug.com/73423. 66 // broken on many systems - see http://crbug.com/73423.
73 return make_scoped_ptr( 67 return make_scoped_ptr(
74 webrtc::ScreenCapturer::Create(*desktop_capture_options_)); 68 webrtc::ScreenCapturer::Create(*desktop_capture_options_));
75 #endif // !defined(OS_CHROMEOS)
76 } 69 }
77 70
78 BasicDesktopEnvironment::BasicDesktopEnvironment( 71 BasicDesktopEnvironment::BasicDesktopEnvironment(
79 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, 72 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
80 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, 73 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
81 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) 74 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
82 : caller_task_runner_(caller_task_runner), 75 : caller_task_runner_(caller_task_runner),
83 input_task_runner_(input_task_runner), 76 input_task_runner_(input_task_runner),
84 ui_task_runner_(ui_task_runner), 77 ui_task_runner_(ui_task_runner),
85 desktop_capture_options_( 78 desktop_capture_options_(
(...skipping 14 matching lines...) Expand all
100 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() { 93 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() {
101 } 94 }
102 95
103 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const { 96 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const {
104 DCHECK(caller_task_runner_->BelongsToCurrentThread()); 97 DCHECK(caller_task_runner_->BelongsToCurrentThread());
105 98
106 return AudioCapturer::IsSupported(); 99 return AudioCapturer::IsSupported();
107 } 100 }
108 101
109 } // namespace remoting 102 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/DEPS ('k') | remoting/host/chromeos/aura_desktop_capturer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698