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

views/accelerator.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 "views/accelerator.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "app/l10n_util.h"
+#include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "grit/app_strings.h"
 
 namespace views {
 
 std::wstring Accelerator::GetShortcutText() const {
   int string_id = 0;
   switch(key_code_) {
     case base::VKEY_TAB:
@@ skipping 63 matching lines @@
   } else {
     shortcut = l10n_util::GetString(string_id);
   }
 
   // Checking whether the character used for the accelerator is alphanumeric.
   // If it is not, then we need to adjust the string later on if the locale is
   // right-to-left. See below for more information of why such adjustment is
   // required.
   std::wstring shortcut_rtl;
   bool adjust_shortcut_for_rtl = false;
-  if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT &&
-      shortcut.length() == 1 &&
-      !IsAsciiAlpha(shortcut.at(0)) &&
-      !IsAsciiDigit(shortcut.at(0))) {
+  if (base::i18n::IsRTL() && shortcut.length() == 1 &&
+      !IsAsciiAlpha(shortcut.at(0)) && !IsAsciiDigit(shortcut.at(0))) {
     adjust_shortcut_for_rtl = true;
     shortcut_rtl.assign(shortcut);
   }
 
   if (IsShiftDown())
     shortcut = l10n_util::GetStringF(IDS_APP_SHIFT_MODIFIER, shortcut);
 
   // Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut.
   // See http://blogs.msdn.com/oldnewthing/archive/2004/03/29/101121.aspx for
   // more information.
@@ skipping 29 matching lines @@
 
     // Subtracting the size of the shortcut key and 1 for the '+' sign.
     shortcut_rtl.append(shortcut, 0, shortcut.length() - key_length - 1);
     shortcut.swap(shortcut_rtl);
   }
 
   return shortcut;
 }
 
 }  // namespace views