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/strings/string_number_conversions.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chromium/base/strings/string_number_conversions.h') diff --git a/chromium/base/strings/string_number_conversions.h b/chromium/base/strings/string_number_conversions.h index 87df24e21c9..f001641d186 100644 --- a/chromium/base/strings/string_number_conversions.h +++ b/chromium/base/strings/string_number_conversions.h @@ -20,10 +20,6 @@ // ---------------------------------------------------------------------------- // IMPORTANT MESSAGE FROM YOUR SPONSOR // -// This file contains no "wstring" variants. New code should use string16. If -// you need to make old code work, use the UTF8 version and convert. Please do -// not add wstring variants. -// // Please do not add "convenience" functions for converting strings to integers // that return the value and ignore success/failure. That encourages people to // write code that doesn't properly handle the error conditions. @@ -154,4 +150,8 @@ BASE_EXPORT bool HexStringToSpan(StringPiece input, base::span output); } // namespace base +#if defined(OS_WIN) +#include "base/strings/string_number_conversions_win.h" +#endif + #endif // BASE_STRINGS_STRING_NUMBER_CONVERSIONS_H_ -- cgit v1.2.1