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

views/controls/textfield/native_textfield_win.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 "views/controls/textfield/native_textfield_win.h"
 
 #include <algorithm>
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win_util.h"
+#include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
 #include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
 #include "skia/ext/skia_utils_win.h"
 #include "views/controls/menu/menu_win.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/textfield/textfield.h"
@@ skipping 100 matching lines @@
   std::wstring str;
   GetWindowText(WriteInto(&str, len), len);
   return str;
 }
 
 void NativeTextfieldWin::UpdateText() {
   std::wstring text = textfield_->text();
   // Adjusting the string direction before setting the text in order to make
   // sure both RTL and LTR strings are displayed properly.
   std::wstring text_to_set;
-  if (!l10n_util::AdjustStringForLocaleDirection(text, &text_to_set))
+  if (!base::i18n::AdjustStringForLocaleDirection(text, &text_to_set))
     text_to_set = text;
   if (textfield_->style() & Textfield::STYLE_LOWERCASE)
     text_to_set = l10n_util::ToLower(text_to_set);
   SetWindowText(text_to_set.c_str());
 }
 
 void NativeTextfieldWin::AppendText(const string16& text) {
   int text_length = GetWindowTextLength();
   ::SendMessage(m_hWnd, TBM_SETSEL, true, MAKELPARAM(text_length, text_length));
   ::SendMessage(m_hWnd, EM_REPLACESEL, false,
@@ skipping 656 matching lines @@
   // Clip the X coordinate to the left edge of the text.  Careful:
   // PosFromChar(0) may return a negative X coordinate if the beginning of the
   // text has scrolled off the edit, so don't go past the clip rect's edge.
   PARAFORMAT2 pf2;
   GetParaFormat(pf2);
   // Calculation of the clipped coordinate is more complicated if the paragraph
   // layout is RTL layout, or if there is RTL characters inside the LTR layout
   // paragraph.
   bool ltr_text_in_ltr_layout = true;
   if ((pf2.wEffects & PFE_RTLPARA) ||
-      l10n_util::StringContainsStrongRTLChars(GetText())) {
+      base::i18n::StringContainsStrongRTLChars(GetText())) {
     ltr_text_in_ltr_layout = false;
   }
   const int length = GetTextLength();
   RECT r;
   GetRect(&r);
   // The values returned by PosFromChar() seem to refer always
   // to the left edge of the character's bounding box.
   const LONG first_position_x = PosFromChar(0).x;
   LONG min_x = first_position_x;
   if (!ltr_text_in_ltr_layout) {
@@ skipping 80 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTextfieldWrapper, public:
 
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldWin(field);
 }
 
 }  // namespace views