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

chrome/browser/bookmarks/bookmark_table_model.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.
 
 #include "chrome/browser/bookmarks/bookmark_table_model.h"
 
 #include <limits>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model_observer.h"
+#include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
@@ skipping 285 matching lines @@
     case IDS_BOOKMARK_TABLE_TITLE: {
       std::wstring title = node->GetTitle();
       // Adjust the text as well, for example, put LRE-PDF pair around LTR text
       // in RTL enviroment, so that the ending punctuation in the text will not
       // be rendered incorrectly (such as rendered as the leftmost character,
       // and/or rendered as a mirrored punctuation character).
       //
       // TODO(xji): Consider adding a special case if the title text is a URL,
       // since those should always be displayed LTR. Please refer to
       // http://crbug.com/6726 for more information.
-      l10n_util::AdjustStringForLocaleDirection(title, &title);
+      base::i18n::AdjustStringForLocaleDirection(title, &title);
       return title;
     }
 
     case IDS_BOOKMARK_TABLE_URL: {
       if (!node->is_url())
         return std::wstring();
       std::wstring languages = model_ && model_->profile()
           ? model_->profile()->GetPrefs()->GetString(prefs::kAcceptLanguages)
           : std::wstring();
       std::wstring url_text = net::FormatUrl(node->GetURL(), languages, false,
           UnescapeRule::SPACES, NULL, NULL, NULL);
-      if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
-        l10n_util::WrapStringWithLTRFormatting(&url_text);
+      if (base::i18n::IsRTL())
+        base::i18n::WrapStringWithLTRFormatting(&url_text);
       return url_text;
     }
 
     case IDS_BOOKMARK_TABLE_PATH: {
       std::wstring path;
       BuildPath(node->GetParent(), &path);
       // Force path to have LTR directionality. The whole path (but not every
       // single path component) is marked with LRE-PDF. For example,
       // ALEPH/BET/GIMEL (using uppercase English for Hebrew) is supposed to
       // appear (visually) as LEMIG/TEB/HPELA; foo/C/B/A.doc refers to file
       // C.doc in directory B in directory A in directory foo, not to file
       // A.doc in directory B in directory C in directory foo. The reason to
       // mark the whole path, but not every single path component, as LTR is
       // because paths need to get written in text documents, and that is how
       // they will appear there. Being a saint and doing the tedious formatting
       // to every single path component to get it to come out in the logical
       // order will accomplish nothing but confuse people, since they will now
       // see both formats being used, and will never know what anything means.
       // Furthermore, doing the "logical" formatting with characters like LRM,
       // LRE, and PDF to every single path component means that when someone
       // copy/pastes your path, it will still contain those characters, and
       // trying to access the file will fail because of them. Windows Explorer,
       // Firefox, IE, Nautilus, gedit choose to format only the whole path as
       // LTR too. The point here is to display the path the same way as it's
       // displayed by other software.
-      if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
-        l10n_util::WrapStringWithLTRFormatting(&path);
+      if (base::i18n::IsRTL())
+        base::i18n::WrapStringWithLTRFormatting(&path);
       return path;
     }
   }
   NOTREACHED();
   return std::wstring();
 }
 
 SkBitmap BookmarkTableModel::GetIcon(int row) {
   static SkBitmap* folder_icon = ResourceBundle::GetSharedInstance().
         GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER);
@@ skipping 34 matching lines @@
     return;
   }
   if (node == model()->other_node()) {
     *path = l10n_util::GetString(IDS_BOOKMARK_TABLE_OTHER_BOOKMARKS_PATH);
     return;
   }
   BuildPath(node->GetParent(), path);
   path->append(l10n_util::GetString(IDS_BOOKMARK_TABLE_PATH_SEPARATOR));
   path->append(node->GetTitle());
 }