| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/base/text/bytes_formatting.h" | 5 #include "ui/base/text/bytes_formatting.h" |
| 6 | 6 |
| 7 #include "base/i18n/number_formatting.h" | 7 #include "base/i18n/number_formatting.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "grit/ui_strings.h" | |
| 12 #include "ui/base/l10n/l10n_util.h" | 11 #include "ui/base/l10n/l10n_util.h" |
| 12 #include "ui/strings/grit/ui_strings.h" |
| 13 | 13 |
| 14 namespace ui { | 14 namespace ui { |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 // Byte suffix string constants. These both must match the DataUnits enum. | 18 // Byte suffix string constants. These both must match the DataUnits enum. |
| 19 const int kByteStrings[] = { | 19 const int kByteStrings[] = { |
| 20 IDS_APP_BYTES, | 20 IDS_APP_BYTES, |
| 21 IDS_APP_KIBIBYTES, | 21 IDS_APP_KIBIBYTES, |
| 22 IDS_APP_MEBIBYTES, | 22 IDS_APP_MEBIBYTES, |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 | 105 |
| 106 base::string16 FormatBytes(int64 bytes) { | 106 base::string16 FormatBytes(int64 bytes) { |
| 107 return FormatBytesWithUnits(bytes, GetByteDisplayUnits(bytes), true); | 107 return FormatBytesWithUnits(bytes, GetByteDisplayUnits(bytes), true); |
| 108 } | 108 } |
| 109 | 109 |
| 110 base::string16 FormatSpeed(int64 bytes) { | 110 base::string16 FormatSpeed(int64 bytes) { |
| 111 return FormatSpeedWithUnits(bytes, GetByteDisplayUnits(bytes), true); | 111 return FormatSpeedWithUnits(bytes, GetByteDisplayUnits(bytes), true); |
| 112 } | 112 } |
| 113 | 113 |
| 114 } // namespace ui | 114 } // namespace ui |
| OLD | NEW |