request review: fix issue 2821 and 6132

chrome/browser/task_manager.cc

 // Copyright (c) 2006-2008 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/task_manager.h"
 
 #include "base/process_util.h"
 #include "base/stats_table.h"
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
@@ skipping 96 matching lines @@
     case IDS_TASK_MANAGER_PAGE_COLUMN:  // Process
       return resource->GetTitle();
 
     // Only the first item from a group shows the process info.
     case IDS_TASK_MANAGER_NET_COLUMN: {  // Net
       int64 net_usage = GetNetworkUsage(resource);
       if (net_usage == -1)
         return l10n_util::GetString(IDS_TASK_MANAGER_NA_CELL_TEXT);
       if (net_usage == 0)
         return std::wstring(L"0");
-      return FormatSpeed(net_usage, GetByteDisplayUnits(net_usage), true);
+      std::wstring net_byte =
+          FormatSpeed(net_usage, GetByteDisplayUnits(net_usage), true);
+      // Force number string to have LTR directionality.
+      if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
+        l10n_util::WrapStringWithLTRFormatting(&net_byte);
+      return net_byte;
     }
 
     case IDS_TASK_MANAGER_CPU_COLUMN:  // CPU
       if (!first_in_group)
         return std::wstring();
       return IntToWString(GetCPUUsage(resource));
 
-    case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN:  // Memory
+    case IDS_TASK_MANAGER_PRIVATE_MEM_COLUMN: {  // Memory
       // We report committed (working set + paged) private usage. This is NOT
       // going to match what Windows Task Manager shows (which is working set).
       if (!first_in_group)
         return std::wstring();
-      return l10n_util::GetStringF(
-          IDS_TASK_MANAGER_MEM_CELL_TEXT,
-          FormatNumber(GetPrivateMemory(process_metrics)));
+      std::wstring number = FormatNumber(GetPrivateMemory(process_metrics));
+      return GetMemCellText(&number);
+    }
 
-    case IDS_TASK_MANAGER_SHARED_MEM_COLUMN:  // Memory
+    case IDS_TASK_MANAGER_SHARED_MEM_COLUMN: {  // Memory
       if (!first_in_group)
         return std::wstring();
-      return l10n_util::GetStringF(
-          IDS_TASK_MANAGER_MEM_CELL_TEXT,
-          FormatNumber(GetSharedMemory(process_metrics)));      
+      std::wstring number = FormatNumber(GetSharedMemory(process_metrics));
+      return GetMemCellText(&number);
+    }
 
-    case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN:  // Memory
+    case IDS_TASK_MANAGER_PHYSICAL_MEM_COLUMN: {  // Memory
       if (!first_in_group)
         return std::wstring();
-      return l10n_util::GetStringF(
-          IDS_TASK_MANAGER_MEM_CELL_TEXT,
-          FormatNumber(GetPhysicalMemory(process_metrics)));
+      std::wstring number = FormatNumber(GetPhysicalMemory(process_metrics));
+      return GetMemCellText(&number);
+    }
 
     case IDS_TASK_MANAGER_PROCESS_ID_COLUMN:
       if (!first_in_group)
         return std::wstring();
       return IntToWString(base::GetProcId(resource->GetProcess()));
       
     case kGoatsTeleportedColumn:  // Goats Teleported.
       goats_teleported_ += rand();
       return FormatNumber(goats_teleported_);
 
@@ skipping 48 matching lines @@
     if (counter != NULL && counter[0] != '\0') {
       return table->GetCounterValue(counter,
           base::GetProcId(resource->GetProcess()));
      } else {
         NOTREACHED() << "Invalid column.";
      }
   }
   return 0;
 }
 
+std::wstring TaskManagerTableModel::GetMemCellText(
+    std::wstring* number) const {
+  // Adjust number string if necessary.
+  l10n_util::AdjustStringForLocaleDirection(*number, number);
+  return l10n_util::GetStringF(IDS_TASK_MANAGER_MEM_CELL_TEXT, *number);
+}
+
 SkBitmap TaskManagerTableModel::GetIcon(int row) {
   DCHECK(row < RowCount());
   SkBitmap icon = resources_[row]->GetIcon();
   if (!icon.isNull())
     return icon;
 
   static SkBitmap* default_icon = ResourceBundle::GetSharedInstance().
       GetBitmapNamed(IDR_DEFAULT_FAVICON);
   return *default_icon;
 }
@@ skipping 858 matching lines @@
 
 views::View* TaskManager::GetContentsView() {
   return contents_.get();
 }
 
 // static
 TaskManager* TaskManager::GetInstance() {
   return Singleton<TaskManager>::get();
 }