Localize strings, speeds.

chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc

 // 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/gtk/gtk_chrome_cookie_view.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/text/bytes_formatting.h"
 
 namespace {
 
 void InitBrowserDetailStyle(GtkWidget* entry, GtkStyle* label_style,
                             GtkStyle* dialog_style) {
   gtk_widget_modify_fg(entry, GTK_STATE_NORMAL,
                        &label_style->fg[GTK_STATE_NORMAL]);
   gtk_widget_modify_fg(entry, GTK_STATE_INSENSITIVE,
                        &label_style->fg[GTK_STATE_INSENSITIVE]);
   // GTK_NO_WINDOW widgets like GtkLabel don't draw their own background, so we
@@ skipping 511 matching lines @@
 
   gtk_entry_set_text(
       GTK_ENTRY(self->database_name_entry_),
       database_info.database_name.empty() ?
           l10n_util::GetStringUTF8(
               IDS_COOKIES_WEB_DATABASE_UNNAMED_NAME).c_str() :
           database_info.database_name.c_str());
   gtk_entry_set_text(GTK_ENTRY(self->database_description_entry_),
                      database_info.description.c_str());
   gtk_entry_set_text(GTK_ENTRY(self->database_size_entry_),
-                     UTF16ToUTF8(FormatBytes(
-                         database_info.size,
-                         GetByteDisplayUnits(database_info.size),
-                         true)).c_str());
+                     UTF16ToUTF8(ui::FormatBytes(database_info.size)).c_str());
   gtk_entry_set_text(GTK_ENTRY(self->database_last_modified_entry_),
                      UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(
                          database_info.last_modified)).c_str());
   SetDatabaseDetailsSensitivity(self, TRUE);
 }
 
 // Switches the display to showing the passed in local storage data.
 void gtk_chrome_cookie_view_display_local_storage(
     GtkChromeCookieView* self,
     const BrowsingDataLocalStorageHelper::LocalStorageInfo&
     local_storage_info) {
   UpdateVisibleDetailedInfo(self, self->local_storage_details_table_);
 
   gtk_entry_set_text(GTK_ENTRY(self->local_storage_origin_entry_),
                      local_storage_info.origin.c_str());
   gtk_entry_set_text(GTK_ENTRY(self->local_storage_size_entry_),
-                     UTF16ToUTF8(FormatBytes(
-                         local_storage_info.size,
-                         GetByteDisplayUnits(local_storage_info.size),
-                         true)).c_str());
+                     UTF16ToUTF8(ui::FormatBytes(
+                         local_storage_info.size)).c_str());
   gtk_entry_set_text(GTK_ENTRY(self->local_storage_last_modified_entry_),
                      UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(
                          local_storage_info.last_modified)).c_str());
   SetLocalStorageDetailsSensitivity(self, TRUE);
 }
 
 // Switches the display to showing the passed in app cache.
 void gtk_chrome_cookie_view_display_app_cache(
     GtkChromeCookieView* self,
     const appcache::AppCacheInfo& info) {
   UpdateVisibleDetailedInfo(self, self->appcache_details_table_);
 
   gtk_entry_set_text(GTK_ENTRY(self->appcache_manifest_entry_),
                      info.manifest_url.spec().c_str());
   gtk_entry_set_text(GTK_ENTRY(self->appcache_size_entry_),
-                     UTF16ToUTF8(FormatBytes(
-                         info.size,
-                         GetByteDisplayUnits(info.size),
-                         true)).c_str());
+                     UTF16ToUTF8(ui::FormatBytes(info.size)).c_str());
   gtk_entry_set_text(GTK_ENTRY(self->appcache_created_entry_),
                      UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(
                          info.creation_time)).c_str());
   gtk_entry_set_text(GTK_ENTRY(self->appcache_last_accessed_entry_),
                      UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(
                          info.last_access_time)).c_str());
   SetAppCacheDetailsSensitivity(self, TRUE);
 }
 
 // Switches the display to showing the passed in IndexedDB data.
 void gtk_chrome_cookie_view_display_indexed_db(
     GtkChromeCookieView* self,
     const BrowsingDataIndexedDBHelper::IndexedDBInfo& indexed_db_info) {
   UpdateVisibleDetailedInfo(self, self->indexed_db_details_table_);
 
   gtk_entry_set_text(GTK_ENTRY(self->indexed_db_origin_entry_),
                      indexed_db_info.origin.c_str());
   gtk_entry_set_text(GTK_ENTRY(self->indexed_db_size_entry_),
-                     UTF16ToUTF8(FormatBytes(
-                         indexed_db_info.size,
-                         GetByteDisplayUnits(indexed_db_info.size),
-                         true)).c_str());
+                     UTF16ToUTF8(ui::FormatBytes(
+                         indexed_db_info.size)).c_str());
   gtk_entry_set_text(GTK_ENTRY(self->indexed_db_last_modified_entry_),
                      UTF16ToUTF8(base::TimeFormatFriendlyDateAndTime(
                          indexed_db_info.last_modified)).c_str());
   SetLocalStorageDetailsSensitivity(self, TRUE);
 }
 
 void gtk_chrome_cookie_view_display_local_storage_item(
     GtkChromeCookieView* self,
     const std::string& host,
     const string16& key,
@@ skipping 17 matching lines @@
     unsigned long estimated_size) {
   UpdateVisibleDetailedInfo(self, self->database_accessed_table_);
 
   gtk_entry_set_text(GTK_ENTRY(self->database_accessed_origin_entry_),
                      host.c_str());
   gtk_entry_set_text(GTK_ENTRY(self->database_accessed_name_entry_),
                      UTF16ToUTF8(database_name).c_str());
   gtk_entry_set_text(GTK_ENTRY(self->database_accessed_description_entry_),
                      UTF16ToUTF8(display_name).c_str());
   gtk_entry_set_text(GTK_ENTRY(self->database_accessed_size_entry_),
-                     UTF16ToUTF8(FormatBytes(
-                         estimated_size,
-                         GetByteDisplayUnits(estimated_size),
-                         true)).c_str());
+                     UTF16ToUTF8(ui::FormatBytes(estimated_size)).c_str());
   SetDatabaseAccessedSensitivity(self, TRUE);
 }
 
 void gtk_chrome_cookie_view_display_appcache_created(
     GtkChromeCookieView* self,
     const GURL& manifest_url) {
   UpdateVisibleDetailedInfo(self, self->appcache_created_table_);
   gtk_entry_set_text(GTK_ENTRY(self->appcache_created_manifest_entry_),
                      manifest_url.spec().c_str());
   SetAppCacheCreatedSensitivity(self, TRUE);
 }
 
 bool gtk_chrome_cookie_view_session_expires(GtkChromeCookieView* self) {
   if (self->cookie_expires_entry_)
     return false;
 
   GtkListStore* store = self->cookie_expires_combobox_store_;
   int store_size = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
   if (store_size == 1)
     return false;
 
   DCHECK_EQ(2, store_size);
 
   int selected = gtk_combo_box_get_active(GTK_COMBO_BOX(
       self->cookie_expires_combobox_));
   return selected == 1;
 }