Localize strings, speeds.

chrome/browser/ui/cocoa/content_settings/cookie_details.mm

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h"
 
 #import "base/i18n/time_formatting.h"
 #include "base/sys_string_conversions.h"
 #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
 
 @implementation CocoaCookieDetails
 
 @synthesize canEditExpiration = canEditExpiration_;
 @synthesize hasExpiration = hasExpiration_;
 @synthesize type = type_;
 
@@ skipping 127 matching lines @@
   return self;
 }
 
 - (id)initWithDatabase:(const BrowsingDataDatabaseHelper::DatabaseInfo*)
     databaseInfo {
   if ((self = [super init])) {
     type_ = kCocoaCookieDetailsTypeTreeDatabase;
     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)) retain]);
     lastModified_.reset([base::SysUTF16ToNSString(
         base::TimeFormatFriendlyDateAndTime(
             databaseInfo->last_modified)) retain]);
   }
   return self;
 }
 
 - (id)initWithLocalStorage:(
     const BrowsingDataLocalStorageHelper::LocalStorageInfo*)storageInfo {
   if ((self = [super init])) {
     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)) retain]);
     lastModified_.reset([base::SysUTF16ToNSString(
         base::TimeFormatFriendlyDateAndTime(
             storageInfo->last_modified)) retain]);
   }
   return self;
 }
 
 - (id)initWithAppCacheInfo:(const appcache::AppCacheInfo*)appcacheInfo {
   if ((self = [super init])) {
     type_ = kCocoaCookieDetailsTypeTreeAppCache;
     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)) retain]);
     created_.reset([base::SysUTF16ToNSString(
         base::TimeFormatFriendlyDateAndTime(
             appcacheInfo->creation_time)) retain]);
     lastAccessed_.reset([base::SysUTF16ToNSString(
         base::TimeFormatFriendlyDateAndTime(
             appcacheInfo->last_access_time)) retain]);
   }
   return self;
 }
 
 - (id)initWithDatabase:(const std::string&)domain
           databaseName:(const string16&)databaseName
    databaseDescription:(const string16&)databaseDescription
               fileSize:(unsigned long)fileSize {
   if ((self = [super init])) {
     type_ = kCocoaCookieDetailsTypePromptDatabase;
     canEditExpiration_ = NO;
     name_.reset([base::SysUTF16ToNSString(databaseName) retain]);
     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)) retain]);
   }
   return self;
 }
 
 - (id)initWithLocalStorage:(const std::string&)domain
                        key:(const string16&)key
                      value:(const string16&)value {
   if ((self = [super init])) {
     type_ = kCocoaCookieDetailsTypePromptLocalStorage;
     canEditExpiration_ = NO;
@@ skipping 12 matching lines @@
   }
   return self;
 }
 
 - (id)initWithIndexedDBInfo:
     (const BrowsingDataIndexedDBHelper::IndexedDBInfo*)indexedDBInfo {
   if ((self = [super init])) {
     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)) retain]);
     lastModified_.reset([base::SysUTF16ToNSString(
         base::TimeFormatFriendlyDateAndTime(
             indexedDBInfo->last_modified)) retain]);
   }
   return self;
 }
 
 + (CocoaCookieDetails*)createFromCookieTreeNode:(CookieTreeNode*)treeNode {
   CookieTreeNode::DetailedInfo info = treeNode->GetDetailedInfo();
   CookieTreeNode::DetailedInfo::NodeType nodeType = info.node_type;
@@ skipping 32 matching lines @@
     details_.reset([details retain]);
   }
   return self;
 }
 
 - (CocoaCookieDetails*)details {
   return details_.get();
 }
 
 @end