From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/base/ios/ios_util.h | 3 +++ chromium/base/ios/ios_util.mm | 5 +++++ chromium/base/ios/weak_nsobject.h | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'chromium/base/ios') diff --git a/chromium/base/ios/ios_util.h b/chromium/base/ios/ios_util.h index 0a512301abe..de44a75ad7e 100644 --- a/chromium/base/ios/ios_util.h +++ b/chromium/base/ios/ios_util.h @@ -25,6 +25,9 @@ BASE_EXPORT bool IsRunningOnIOS12OrLater(); // Returns whether the operating system is iOS 13 or later. BASE_EXPORT bool IsRunningOnIOS13OrLater(); +// Returns whether the operating system is iOS 14 or later. +BASE_EXPORT bool IsRunningOnIOS14OrLater(); + // Returns whether the operating system is at the given version or later. BASE_EXPORT bool IsRunningOnOrLater(int32_t major, int32_t minor, diff --git a/chromium/base/ios/ios_util.mm b/chromium/base/ios/ios_util.mm index a17d19b6826..553b7354331 100644 --- a/chromium/base/ios/ios_util.mm +++ b/chromium/base/ios/ios_util.mm @@ -48,6 +48,11 @@ bool IsRunningOnIOS13OrLater() { return is_running_on_or_later; } +bool IsRunningOnIOS14OrLater() { + static const bool is_running_on_or_later = IsRunningOnOrLater(14, 0, 0); + return is_running_on_or_later; +} + bool IsRunningOnOrLater(int32_t major, int32_t minor, int32_t bug_fix) { static const int32_t* current_version = OSVersionAsArray(); int32_t version[] = {major, minor, bug_fix}; diff --git a/chromium/base/ios/weak_nsobject.h b/chromium/base/ios/weak_nsobject.h index 498cdee28c5..e07c0c9b20b 100644 --- a/chromium/base/ios/weak_nsobject.h +++ b/chromium/base/ios/weak_nsobject.h @@ -8,8 +8,8 @@ #import #import +#include "base/check.h" #include "base/compiler_specific.h" -#include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" -- cgit v1.2.1