OLD | NEW |
---|---|
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/me2me_desktop_environment.h" | 5 #include "remoting/host/me2me_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 "remoting/base/logging.h" | |
9 #include "remoting/host/client_session_control.h" | 10 #include "remoting/host/client_session_control.h" |
10 #include "remoting/host/curtain_mode.h" | 11 #include "remoting/host/curtain_mode.h" |
11 #include "remoting/host/desktop_resizer.h" | 12 #include "remoting/host/desktop_resizer.h" |
13 #include "remoting/host/gnubby_auth_handler.h" | |
12 #include "remoting/host/host_window.h" | 14 #include "remoting/host/host_window.h" |
13 #include "remoting/host/host_window.h" | 15 #include "remoting/host/host_window.h" |
14 #include "remoting/host/host_window_proxy.h" | 16 #include "remoting/host/host_window_proxy.h" |
15 #include "remoting/host/local_input_monitor.h" | 17 #include "remoting/host/local_input_monitor.h" |
16 #include "remoting/host/resizing_host_observer.h" | 18 #include "remoting/host/resizing_host_observer.h" |
17 #include "remoting/host/screen_controls.h" | 19 #include "remoting/host/screen_controls.h" |
18 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" | 20 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" |
19 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" | 21 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h" |
20 | 22 |
21 #if defined(OS_POSIX) | 23 #if defined(OS_POSIX) |
(...skipping 29 matching lines...) Expand all Loading... | |
51 std::string Me2MeDesktopEnvironment::GetCapabilities() const { | 53 std::string Me2MeDesktopEnvironment::GetCapabilities() const { |
52 return kRateLimitResizeRequests; | 54 return kRateLimitResizeRequests; |
53 } | 55 } |
54 | 56 |
55 Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( | 57 Me2MeDesktopEnvironment::Me2MeDesktopEnvironment( |
56 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 58 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
57 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 59 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
58 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) | 60 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
59 : BasicDesktopEnvironment(caller_task_runner, | 61 : BasicDesktopEnvironment(caller_task_runner, |
60 input_task_runner, | 62 input_task_runner, |
61 ui_task_runner) { | 63 ui_task_runner), |
64 gnubby_auth_enabled_(false) { | |
62 DCHECK(caller_task_runner->BelongsToCurrentThread()); | 65 DCHECK(caller_task_runner->BelongsToCurrentThread()); |
63 } | 66 } |
64 | 67 |
68 scoped_ptr<GnubbyAuthHandler> Me2MeDesktopEnvironment::CreateGnubbyAuthHandler( | |
69 protocol::ClientStub* client_stub) { | |
70 if (gnubby_auth_enabled_) { | |
Sergey Ulanov
2014/02/11 08:20:38
please add thread DCHECK():
DCHECK(caller_task_ru
psj
2014/02/12 09:01:01
Done.
| |
71 return scoped_ptr<GnubbyAuthHandler>( | |
72 GnubbyAuthHandler::Create(client_stub)); | |
73 } | |
74 | |
75 HOST_LOG << "gnubby auth is not enabled"; | |
76 return scoped_ptr<GnubbyAuthHandler>(); | |
77 } | |
78 | |
65 bool Me2MeDesktopEnvironment::InitializeSecurity( | 79 bool Me2MeDesktopEnvironment::InitializeSecurity( |
66 base::WeakPtr<ClientSessionControl> client_session_control, | 80 base::WeakPtr<ClientSessionControl> client_session_control, |
67 bool curtain_enabled) { | 81 bool curtain_enabled) { |
68 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 82 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
69 | 83 |
70 // Detach the session from the local console if the caller requested. | 84 // Detach the session from the local console if the caller requested. |
71 if (curtain_enabled) { | 85 if (curtain_enabled) { |
72 curtain_ = CurtainMode::Create(caller_task_runner(), | 86 curtain_ = CurtainMode::Create(caller_task_runner(), |
73 ui_task_runner(), | 87 ui_task_runner(), |
74 client_session_control); | 88 client_session_control); |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
108 disconnect_window_.reset(new HostWindowProxy( | 122 disconnect_window_.reset(new HostWindowProxy( |
109 caller_task_runner(), | 123 caller_task_runner(), |
110 ui_task_runner(), | 124 ui_task_runner(), |
111 disconnect_window_.Pass())); | 125 disconnect_window_.Pass())); |
112 disconnect_window_->Start(client_session_control); | 126 disconnect_window_->Start(client_session_control); |
113 } | 127 } |
114 | 128 |
115 return true; | 129 return true; |
116 } | 130 } |
117 | 131 |
132 void Me2MeDesktopEnvironment::SetEnableGnubbyAuth(bool gnubby_auth_enabled) { | |
133 gnubby_auth_enabled_ = gnubby_auth_enabled; | |
134 } | |
135 | |
118 Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory( | 136 Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory( |
119 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, | 137 scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, |
120 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, | 138 scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, |
121 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) | 139 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) |
122 : BasicDesktopEnvironmentFactory(caller_task_runner, | 140 : BasicDesktopEnvironmentFactory(caller_task_runner, |
123 input_task_runner, | 141 input_task_runner, |
124 ui_task_runner), | 142 ui_task_runner), |
125 curtain_enabled_(false) { | 143 curtain_enabled_(false) { |
126 } | 144 } |
127 | 145 |
128 Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() { | 146 Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() { |
129 } | 147 } |
130 | 148 |
131 scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create( | 149 scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create( |
132 base::WeakPtr<ClientSessionControl> client_session_control) { | 150 base::WeakPtr<ClientSessionControl> client_session_control) { |
133 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 151 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
134 | 152 |
135 scoped_ptr<Me2MeDesktopEnvironment> desktop_environment( | 153 scoped_ptr<Me2MeDesktopEnvironment> desktop_environment( |
136 new Me2MeDesktopEnvironment(caller_task_runner(), | 154 new Me2MeDesktopEnvironment(caller_task_runner(), |
137 input_task_runner(), | 155 input_task_runner(), |
138 ui_task_runner())); | 156 ui_task_runner())); |
139 if (!desktop_environment->InitializeSecurity(client_session_control, | 157 if (!desktop_environment->InitializeSecurity(client_session_control, |
140 curtain_enabled_)) { | 158 curtain_enabled_)) { |
141 return scoped_ptr<DesktopEnvironment>(); | 159 return scoped_ptr<DesktopEnvironment>(); |
142 } | 160 } |
161 desktop_environment->SetEnableGnubbyAuth(gnubby_auth_enabled_); | |
143 | 162 |
144 return desktop_environment.PassAs<DesktopEnvironment>(); | 163 return desktop_environment.PassAs<DesktopEnvironment>(); |
145 } | 164 } |
146 | 165 |
147 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { | 166 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) { |
148 DCHECK(caller_task_runner()->BelongsToCurrentThread()); | 167 DCHECK(caller_task_runner()->BelongsToCurrentThread()); |
149 | 168 |
150 curtain_enabled_ = enable; | 169 curtain_enabled_ = enable; |
151 } | 170 } |
152 | 171 |
172 void Me2MeDesktopEnvironmentFactory::SetEnableGnubbyAuth( | |
173 bool gnubby_auth_enabled) { | |
174 gnubby_auth_enabled_ = gnubby_auth_enabled; | |
175 } | |
176 | |
153 } // namespace remoting | 177 } // namespace remoting |
OLD | NEW |