Localize strings, speeds.

base/string_util.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file defines utility functions for working with strings.
 
 #ifndef BASE_STRING_UTIL_H_
 #define BASE_STRING_UTIL_H_
 #pragma once
 
@@ skipping 389 matching lines @@
   if (c >= 'a' && c <= 'f')
     return c - 'a' + 10;
   return 0;
 }
 
 // Returns true if it's a whitespace character.
 inline bool IsWhitespace(wchar_t c) {
   return wcschr(kWhitespaceWide, c) != NULL;
 }
 
-enum DataUnits {
-  DATA_UNITS_BYTE = 0,
-  DATA_UNITS_KIBIBYTE,
-  DATA_UNITS_MEBIBYTE,
-  DATA_UNITS_GIBIBYTE,
-};
-
-// Return the unit type that is appropriate for displaying the amount of bytes
-// passed in.
-BASE_API DataUnits GetByteDisplayUnits(int64 bytes);
-
-// Return a byte string in human-readable format, displayed in units appropriate
-// specified by 'units', with an optional unit suffix.
-// Ex: FormatBytes(512, DATA_UNITS_KIBIBYTE, true) => "0.5 KB"
-// Ex: FormatBytes(10*1024, DATA_UNITS_MEBIBYTE, false) => "0.1"
-BASE_API string16 FormatBytes(int64 bytes, DataUnits units, bool show_units);
-
-// As above, but with "/s" units.
-// Ex: FormatSpeed(512, DATA_UNITS_KIBIBYTE, true) => "0.5 KB/s"
-// Ex: FormatSpeed(10*1024, DATA_UNITS_MEBIBYTE, false) => "0.1"
-BASE_API string16 FormatSpeed(int64 bytes, DataUnits units, bool show_units);
-
-// Return a number formated with separators in the user's locale way.
-// Ex: FormatNumber(1234567) => 1,234,567
-BASE_API string16 FormatNumber(int64 number);
+// Return a byte string in human-readable format with a unit suffix. Not
+// appropriate for use in any UI; use of FormatBytes and friends in ui/base is
+// highly recommended instead. TODO(avi): Figure out how to get callers to use
+// FormatBytes instead; remove this.

[Mark Mentovai, 2011/06/22 20:24:11]

Where is FormatBytes? It’s not in this file any longer. You should reference the
header or namespace it’s declared in to help people find it. The only reason I
was able to find it was by looking at the rest of your change.

[Avi (use Gerrit), 2011/06/22 20:27:37]

It's in ui/base as noted.

[Mark Mentovai, 2011/06/22 20:29:23]

Avi wrote:
I have no clue how I missed that.

+BASE_API string16 FormatBytesUnlocalized(int64 bytes);
 
 // Starting at |start_offset| (usually 0), replace the first instance of
 // |find_this| with |replace_with|.
 BASE_API void ReplaceFirstSubstringAfterOffset(string16* str,
                                                string16::size_type start_offset,
                                                const string16& find_this,
                                                const string16& replace_with);
 BASE_API void ReplaceFirstSubstringAfterOffset(
     std::string* str,
     std::string::size_type start_offset,
@@ skipping 110 matching lines @@
 #elif defined(WCHAR_T_IS_UTF32)
   typedef uint32 Unsigned;
 #endif
 };
 template<>
 struct ToUnsigned<short> {
   typedef unsigned short Unsigned;
 };
 
 #endif  // BASE_STRING_UTIL_H_