| Index: chrome/browser/ui/cocoa/content_settings/cookie_details.mm
|
| diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm
|
| index 6b87412802645a16cdb2af0f8b06c9ab8951c4a6..d8a3274832881b972643563a1351626d43bedf27 100644
|
| --- a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm
|
| +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm
|
| @@ -9,6 +9,7 @@
|
| #include "grit/generated_resources.h"
|
| #include "chrome/browser/cookies_tree_model.h"
|
| #include "ui/base/l10n/l10n_util_mac.h"
|
| +#include "ui/base/text/bytes_formatting.h"
|
| #include "webkit/appcache/appcache_service.h"
|
|
|
| #pragma mark Cocoa Cookie Details
|
| @@ -156,8 +157,9 @@
|
| canEditExpiration_ = NO;
|
| databaseDescription_.reset([base::SysUTF8ToNSString(
|
| databaseInfo->description) retain]);
|
| - fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(databaseInfo->size,
|
| - GetByteDisplayUnits(databaseInfo->size), true)) retain]);
|
| + fileSize_.reset([base::SysUTF16ToNSString(
|
| + ui::FormatBytes(databaseInfo->size,
|
| + ui::DATA_UNITS_NATURAL, true)) retain]);
|
| lastModified_.reset([base::SysUTF16ToNSString(
|
| base::TimeFormatFriendlyDateAndTime(
|
| databaseInfo->last_modified)) retain]);
|
| @@ -171,8 +173,8 @@
|
| type_ = kCocoaCookieDetailsTypeTreeLocalStorage;
|
| canEditExpiration_ = NO;
|
| domain_.reset([base::SysUTF8ToNSString(storageInfo->origin) retain]);
|
| - fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(storageInfo->size,
|
| - GetByteDisplayUnits(storageInfo->size), true)) retain]);
|
| + fileSize_.reset([base::SysUTF16ToNSString(ui::FormatBytes(storageInfo->size,
|
| + ui::DATA_UNITS_NATURAL, true)) retain]);
|
| lastModified_.reset([base::SysUTF16ToNSString(
|
| base::TimeFormatFriendlyDateAndTime(
|
| storageInfo->last_modified)) retain]);
|
| @@ -186,8 +188,9 @@
|
| canEditExpiration_ = NO;
|
| manifestURL_.reset([base::SysUTF8ToNSString(
|
| appcacheInfo->manifest_url.spec()) retain]);
|
| - fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(appcacheInfo->size,
|
| - GetByteDisplayUnits(appcacheInfo->size), true)) retain]);
|
| + fileSize_.reset([base::SysUTF16ToNSString(
|
| + ui::FormatBytes(appcacheInfo->size,
|
| + ui::DATA_UNITS_NATURAL, true)) retain]);
|
| created_.reset([base::SysUTF16ToNSString(
|
| base::TimeFormatFriendlyDateAndTime(
|
| appcacheInfo->creation_time)) retain]);
|
| @@ -209,8 +212,8 @@
|
| domain_.reset([base::SysUTF8ToNSString(domain) retain]);
|
| databaseDescription_.reset(
|
| [base::SysUTF16ToNSString(databaseDescription) retain]);
|
| - fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(fileSize,
|
| - GetByteDisplayUnits(fileSize), true)) retain]);
|
| + fileSize_.reset([base::SysUTF16ToNSString(ui::FormatBytes(fileSize,
|
| + ui::DATA_UNITS_NATURAL, true)) retain]);
|
| }
|
| return self;
|
| }
|
| @@ -243,8 +246,9 @@
|
| type_ = kCocoaCookieDetailsTypeTreeIndexedDB;
|
| canEditExpiration_ = NO;
|
| domain_.reset([base::SysUTF8ToNSString(indexedDBInfo->origin) retain]);
|
| - fileSize_.reset([base::SysUTF16ToNSString(FormatBytes(indexedDBInfo->size,
|
| - GetByteDisplayUnits(indexedDBInfo->size), true)) retain]);
|
| + fileSize_.reset([base::SysUTF16ToNSString(
|
| + ui::FormatBytes(indexedDBInfo->size,
|
| + ui::DATA_UNITS_NATURAL, true)) retain]);
|
| lastModified_.reset([base::SysUTF16ToNSString(
|
| base::TimeFormatFriendlyDateAndTime(
|
| indexedDBInfo->last_modified)) retain]);
|
|
|