| 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 <string> | 7 #include <string> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/optional.h" | 10 #include "base/optional.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 DesktopEnvironmentOptions& | 33 DesktopEnvironmentOptions& |
| 34 DesktopEnvironmentOptions::operator=( | 34 DesktopEnvironmentOptions::operator=( |
| 35 DesktopEnvironmentOptions&& other) = default; | 35 DesktopEnvironmentOptions&& other) = default; |
| 36 DesktopEnvironmentOptions& | 36 DesktopEnvironmentOptions& |
| 37 DesktopEnvironmentOptions::operator=( | 37 DesktopEnvironmentOptions::operator=( |
| 38 const DesktopEnvironmentOptions& other) = default; | 38 const DesktopEnvironmentOptions& other) = default; |
| 39 | 39 |
| 40 void DesktopEnvironmentOptions::Initialize() { | 40 void DesktopEnvironmentOptions::Initialize() { |
| 41 desktop_capture_options_.set_detect_updated_region(true); | 41 desktop_capture_options_.set_detect_updated_region(true); |
| 42 #if defined (OS_WIN) | 42 #if defined (OS_WIN) |
| 43 // TODO(joedow): Enable the DirectX capturer once the blocking bugs are fixed. | 43 desktop_capture_options_.set_allow_directx_capturer(true); |
| 44 // desktop_capture_options_.set_allow_directx_capturer(true); | |
| 45 #endif | 44 #endif |
| 46 } | 45 } |
| 47 | 46 |
| 48 const DesktopCaptureOptions* | 47 const DesktopCaptureOptions* |
| 49 DesktopEnvironmentOptions::desktop_capture_options() const { | 48 DesktopEnvironmentOptions::desktop_capture_options() const { |
| 50 return &desktop_capture_options_; | 49 return &desktop_capture_options_; |
| 51 } | 50 } |
| 52 | 51 |
| 53 DesktopCaptureOptions* | 52 DesktopCaptureOptions* |
| 54 DesktopEnvironmentOptions::desktop_capture_options() { | 53 DesktopEnvironmentOptions::desktop_capture_options() { |
| (...skipping 27 matching lines...) Expand all Loading... |
| 82 #endif | 81 #endif |
| 83 // This field is for test purpose. Usually it should not be set to false. | 82 // This field is for test purpose. Usually it should not be set to false. |
| 84 base::Optional<bool> detect_updated_region = | 83 base::Optional<bool> detect_updated_region = |
| 85 options.GetBool("Detect-Updated-Region"); | 84 options.GetBool("Detect-Updated-Region"); |
| 86 if (detect_updated_region) { | 85 if (detect_updated_region) { |
| 87 desktop_capture_options_.set_detect_updated_region(*detect_updated_region); | 86 desktop_capture_options_.set_detect_updated_region(*detect_updated_region); |
| 88 } | 87 } |
| 89 } | 88 } |
| 90 | 89 |
| 91 } // namespace remoting | 90 } // namespace remoting |
| OLD | NEW |