Move RTL related functions from app/l10n_util to base/i18n/rtl...

chrome/browser/download/download_util.cc

 // Copyright (c) 2009 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.
 //
 // Download utility implementation
 
 #include "chrome/browser/download/download_util.h"
 
 #if defined(OS_WIN)
 #include <shobjidl.h>
 #endif
 #include <string>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
+#include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 331 matching lines @@
   file_value->SetInteger(L"started",
     static_cast<int>(download->start_time().ToTimeT()));
   file_value->SetString(L"since_string",
     TimeFormat::RelativeDate(download->start_time(), NULL));
   file_value->SetString(L"date_string",
     base::TimeFormatShortDate(download->start_time()));
   file_value->SetInteger(L"id", id);
   file_value->SetString(L"file_path", download->full_path().ToWStringHack());
   // Keep file names as LTR.
   std::wstring file_name = download->GetFileName().ToWStringHack();
-  if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
-    l10n_util::WrapStringWithLTRFormatting(&file_name);
+  if (base::i18n::IsRTL())
+    base::i18n::WrapStringWithLTRFormatting(&file_name);
   file_value->SetString(L"file_name", file_name);
   file_value->SetString(L"url", download->url().spec());
   file_value->SetBoolean(L"otr", download->is_otr());
 
   if (download->state() == DownloadItem::IN_PROGRESS) {
     if (download->safety_state() == DownloadItem::DANGEROUS) {
       file_value->SetString(L"state", L"DANGEROUS");
     } else if (download->is_paused()) {
       file_value->SetString(L"state", L"PAUSED");
     } else {
@@ skipping 26 matching lines @@
 std::wstring GetProgressStatusText(DownloadItem* download) {
   int64 total = download->total_bytes();
   int64 size = download->received_bytes();
   DataUnits amount_units = GetByteDisplayUnits(size);
   std::wstring received_size = FormatBytes(size, amount_units, true);
   std::wstring amount = received_size;
 
   // Adjust both strings for the locale direction since we don't yet know which
   // string we'll end up using for constructing the final progress string.
   std::wstring amount_localized;
-  if (l10n_util::AdjustStringForLocaleDirection(amount, &amount_localized)) {
+  if (base::i18n::AdjustStringForLocaleDirection(amount, &amount_localized)) {
     amount.assign(amount_localized);
     received_size.assign(amount_localized);
   }
 
   if (total) {
     amount_units = GetByteDisplayUnits(total);
     std::wstring total_text = FormatBytes(total, amount_units, true);
     std::wstring total_text_localized;
-    if (l10n_util::AdjustStringForLocaleDirection(total_text,
-                                                  &total_text_localized))
+    if (base::i18n::AdjustStringForLocaleDirection(total_text,
+                                                   &total_text_localized))
       total_text.assign(total_text_localized);
 
     amount = l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_SIZE,
                                    received_size,
                                    total_text);
   } else {
     amount.assign(received_size);
   }
   amount_units = GetByteDisplayUnits(download->CurrentSpeed());
   std::wstring speed_text = FormatSpeed(download->CurrentSpeed(),
                                         amount_units, true);
   std::wstring speed_text_localized;
-  if (l10n_util::AdjustStringForLocaleDirection(speed_text,
-                                                &speed_text_localized))
+  if (base::i18n::AdjustStringForLocaleDirection(speed_text,
+                                                 &speed_text_localized))
     speed_text.assign(speed_text_localized);
 
   base::TimeDelta remaining;
   std::wstring time_remaining;
   if (download->is_paused())
     time_remaining = l10n_util::GetString(IDS_DOWNLOAD_PROGRESS_PAUSED);
   else if (download->TimeRemaining(&remaining))
     time_remaining = TimeFormat::TimeRemaining(remaining);
 
   if (time_remaining.empty()) {
@@ skipping 36 matching lines @@
     else if (!progress_known)
       taskbar->SetProgressState(frame, TBPF_INDETERMINATE);
     else
       taskbar->SetProgressValue(frame, (int)(progress * 100), 100);
   }
 #endif
 }
 #endif
 
 }  // namespace download_util