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

chrome/browser/views/go_button.cc

 // Copyright (c) 2010 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/views/go_button.h"
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
+#include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "grit/generated_resources.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 78 matching lines @@
 
   // Need to make sure the text direction is adjusted based on the locale so
   // that pure LTR strings are displayed appropriately on RTL locales. For
   // example, not adjusting the string will cause the URL
   // "http://www.google.com/" to be displayed in the tooltip as
   // "/http://www.google.com".
   //
   // Note that we mark the URL's text as LTR (instead of examining the
   // characters and guessing the text directionality) since URLs are always
   // treated as left-to-right text, even when they contain RTL characters.
-  if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
-    l10n_util::WrapStringWithLTRFormatting(&current_text);
+  if (base::i18n::IsRTL())
+    base::i18n::WrapStringWithLTRFormatting(&current_text);
 
   AutocompleteEditModel* edit_model = location_bar_->location_entry()->model();
   if (edit_model->CurrentTextIsURL()) {
     tooltip->assign(l10n_util::GetStringF(IDS_TOOLTIP_GO_SITE, current_text));
   } else {
     std::wstring keyword(edit_model->keyword());
     TemplateURLModel* template_url_model =
         location_bar_->profile()->GetTemplateURLModel();
     const TemplateURL* provider =
         (keyword.empty() || edit_model->is_keyword_hint()) ?
         template_url_model->GetDefaultSearchProvider() :
         template_url_model->GetTemplateURLForKeyword(keyword);
     if (!provider)
         return false;
     tooltip->assign(l10n_util::GetStringF(IDS_TOOLTIP_GO_SEARCH,
         provider->AdjustedShortNameForLocaleDirection(), current_text));
   }
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // GoButton, private:
 
 void GoButton::OnButtonTimer() {
   stop_timer_.RevokeAll();
   ChangeMode(intended_mode_, true);
 }