| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/desktop_environment_options.h" | 5 #include "remoting/host/desktop_environment_options.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 namespace remoting { | 9 namespace remoting { |
| 10 | 10 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 DesktopEnvironmentOptions& | 30 DesktopEnvironmentOptions& |
| 31 DesktopEnvironmentOptions::operator=( | 31 DesktopEnvironmentOptions::operator=( |
| 32 DesktopEnvironmentOptions&& other) = default; | 32 DesktopEnvironmentOptions&& other) = default; |
| 33 DesktopEnvironmentOptions& | 33 DesktopEnvironmentOptions& |
| 34 DesktopEnvironmentOptions::operator=( | 34 DesktopEnvironmentOptions::operator=( |
| 35 const DesktopEnvironmentOptions& other) = default; | 35 const DesktopEnvironmentOptions& other) = default; |
| 36 | 36 |
| 37 void DesktopEnvironmentOptions::Initialize() { | 37 void DesktopEnvironmentOptions::Initialize() { |
| 38 desktop_capture_options_.set_detect_updated_region(true); | 38 desktop_capture_options_.set_detect_updated_region(true); |
| 39 #if defined (OS_WIN) | 39 #if defined (OS_WIN) |
| 40 desktop_capture_options_.set_allow_directx_capturer(true); | 40 // TODO(joedow): Enable the DirectX capturer once the blocking bugs are fixed. |
| 41 // desktop_capture_options_.set_allow_directx_capturer(true); |
| 41 #endif | 42 #endif |
| 42 } | 43 } |
| 43 | 44 |
| 44 const DesktopCaptureOptions* | 45 const DesktopCaptureOptions* |
| 45 DesktopEnvironmentOptions::desktop_capture_options() const { | 46 DesktopEnvironmentOptions::desktop_capture_options() const { |
| 46 return &desktop_capture_options_; | 47 return &desktop_capture_options_; |
| 47 } | 48 } |
| 48 | 49 |
| 49 DesktopCaptureOptions* | 50 DesktopCaptureOptions* |
| 50 DesktopEnvironmentOptions::desktop_capture_options() { | 51 DesktopEnvironmentOptions::desktop_capture_options() { |
| (...skipping 10 matching lines...) Expand all Loading... |
| 61 | 62 |
| 62 bool DesktopEnvironmentOptions::enable_user_interface() const { | 63 bool DesktopEnvironmentOptions::enable_user_interface() const { |
| 63 return enable_user_interface_; | 64 return enable_user_interface_; |
| 64 } | 65 } |
| 65 | 66 |
| 66 void DesktopEnvironmentOptions::set_enable_user_interface(bool enabled) { | 67 void DesktopEnvironmentOptions::set_enable_user_interface(bool enabled) { |
| 67 enable_user_interface_ = enabled; | 68 enable_user_interface_ = enabled; |
| 68 } | 69 } |
| 69 | 70 |
| 70 } // namespace remoting | 71 } // namespace remoting |
| OLD | NEW |