Chromium Code Reviews| Index: remoting/host/desktop_environment_options.h |
| diff --git a/remoting/host/desktop_environment_options.h b/remoting/host/desktop_environment_options.h |
| index 31044c64bb14952dee1a355c28fa4c11b95d5c11..37739cb8895f0cf7399900c64d14eec27337ee30 100644 |
| --- a/remoting/host/desktop_environment_options.h |
| +++ b/remoting/host/desktop_environment_options.h |
| @@ -8,12 +8,9 @@ |
| #include <memory> |
| #include "base/memory/weak_ptr.h" |
| +#include "remoting/host/host_session_options.h" |
| #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h" |
| -namespace webrtc { |
| -class DesktopCaptureOptions; |
| -} // namespace webrtc |
| - |
| namespace remoting { |
| // A container of options a DesktopEnvironment or its derived classes need to |
| @@ -42,6 +39,9 @@ class DesktopEnvironmentOptions final { |
| const webrtc::DesktopCaptureOptions* desktop_capture_options() const; |
| webrtc::DesktopCaptureOptions* desktop_capture_options(); |
| + // Reads configurations from a HostSessionOptions instance. |
| + void Import(const HostSessionOptions& options); |
|
Sergey Ulanov
2017/01/23 00:51:35
nit: maybe call it ApplyHostSessionOptions()?
Hzj_jie
2017/02/08 01:56:29
Done.
|
| + |
| private: |
| // Sets default values for default constructor and CreateDefault() function. |
| void Initialize(); |