Commit e7665f32 authored by Alexander Cooper's avatar Alexander Cooper Committed by Commit Bot

Switch content/browser/xr to use base::Contains

Currently we've rolled our own helper method "ContainsFeature"; however,
this essentially duplicates base::Contains (which is slightly shorter).
Remove this helper method and use base::Contains instead.

Change-Id: Icc4d92190536bbd7203474305bf891e48e4cb7dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537786
Commit-Queue: Alexander Cooper <alcooper@chromium.org>
Commit-Queue: Klaus Weidner <klausw@chromium.org>
Auto-Submit: Alexander Cooper <alcooper@chromium.org>
Reviewed-by: default avatarKlaus Weidner <klausw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827477}
parent 27fdaae4
......@@ -14,6 +14,7 @@
#include "base/callback_helpers.h"
#include "base/numerics/ranges.h"
#include "base/stl_util.h"
#include "build/build_config.h"
#include "content/browser/xr/service/vr_service_impl.h"
#include "content/browser/xr/xr_utils.h"
......@@ -166,13 +167,6 @@ constexpr device::mojom::XRSessionFeature kOpenXRFeatures[] = {
device::mojom::XRSessionFeature::REF_SPACE_UNBOUNDED,
};
#endif
bool ContainsFeature(
base::span<const device::mojom::XRSessionFeature> feature_list,
device::mojom::XRSessionFeature feature) {
return std::find(feature_list.begin(), feature_list.end(), feature) !=
feature_list.end();
}
} // anonymous namespace
BrowserXRRuntimeImpl::BrowserXRRuntimeImpl(
......@@ -239,20 +233,20 @@ bool BrowserXRRuntimeImpl::SupportsFeature(
}
#endif
return ContainsFeature(kARCoreDeviceFeatures, feature);
return base::Contains(kARCoreDeviceFeatures, feature);
case device::mojom::XRDeviceId::ORIENTATION_DEVICE_ID:
return ContainsFeature(kOrientationDeviceFeatures, feature);
return base::Contains(kOrientationDeviceFeatures, feature);
case device::mojom::XRDeviceId::GVR_DEVICE_ID:
return ContainsFeature(kGVRDeviceFeatures, feature);
return base::Contains(kGVRDeviceFeatures, feature);
#if BUILDFLAG(ENABLE_WINDOWS_MR)
case device::mojom::XRDeviceId::WINDOWS_MIXED_REALITY_ID:
return ContainsFeature(kWindowsMixedRealityFeatures, feature);
return base::Contains(kWindowsMixedRealityFeatures, feature);
#endif
#if BUILDFLAG(ENABLE_OPENXR)
case device::mojom::XRDeviceId::OPENXR_DEVICE_ID:
return ContainsFeature(kOpenXRFeatures, feature);
return base::Contains(kOpenXRFeatures, feature);
#endif
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment