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

chrome/renderer/localized_error.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 "chrome/renderer/localized_error.h"
 
 #include "app/l10n_util.h"
+#include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
 #include "webkit/glue/webkit_glue.h"
 
@@ skipping 81 matching lines @@
    IDS_ERRORPAGES_TITLE_LOAD_FAILED,
    IDS_ERRORPAGES_HEADING_BAD_SSL_CLIENT_AUTH_CERT,
    IDS_ERRORPAGES_SUMMARY_BAD_SSL_CLIENT_AUTH_CERT,
    IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT,
    SUGGEST_NONE,
   },
 };
 
 bool LocaleIsRTL() {
 #if defined(TOOLKIT_GTK)
-  // l10n_util::GetTextDirection uses the GTK text direction, which doesn't work
+  // base::i18n::GetTextDirection uses the GTK text direction, which doesn't work
   // within the renderer sandbox.
-  return l10n_util::GetICUTextDirection() == l10n_util::RIGHT_TO_LEFT;
+  return base::i18n::GetICUTextDirection() == base::i18n::RIGHT_TO_LEFT;
 #else
-  return l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT;
+  return base::i18n::IsRTL();
 #endif
 }
 
 }  // namespace
 
 void GetLocalizedErrorValues(const WebURLError& error,
                              DictionaryValue* error_strings) {
   bool rtl = LocaleIsRTL();
   error_strings->SetString(L"textdirection", rtl ? L"rtl" : L"ltr");
 
@@ skipping 25 matching lines @@
   if (options.suggestions != SUGGEST_NONE) {
     suggestions_heading =
         l10n_util::GetString(IDS_ERRORPAGES_SUGGESTION_HEADING);
   }
   error_strings->SetString(L"suggestionsHeading", suggestions_heading);
 
   std::wstring failed_url(
       ASCIIToWide(std::string(error.unreachableURL.spec())));
   // URLs are always LTR.
   if (rtl)
-    l10n_util::WrapStringWithLTRFormatting(&failed_url);
+    base::i18n::WrapStringWithLTRFormatting(&failed_url);
   error_strings->SetString(L"title",
                            l10n_util::GetStringF(options.title_resource_id,
                                                  failed_url));
   error_strings->SetString(L"heading",
                            l10n_util::GetString(options.heading_resource_id));
 
   DictionaryValue* summary = new DictionaryValue;
   summary->SetString(L"msg",
       l10n_util::GetString(options.summary_resource_id));
   // TODO(tc): we want the unicode url here since it's being displayed
@@ skipping 20 matching lines @@
   if (options.suggestions & SUGGEST_HOSTNAME) {
     // Only show the "Go to hostname" suggestion if the failed_url has a path.
     const GURL& failed_url = error.unreachableURL;
     if (std::string() == failed_url.path()) {
       DictionaryValue* suggest_home_page = new DictionaryValue;
       suggest_home_page->SetString(L"suggestionsHomepageMsg",
           l10n_util::GetString(IDS_ERRORPAGES_SUGGESTION_HOMEPAGE));
       std::wstring homepage(ASCIIToWide(failed_url.GetWithEmptyPath().spec()));
       // URLs are always LTR.
       if (rtl)
-        l10n_util::WrapStringWithLTRFormatting(&homepage);
+        base::i18n::WrapStringWithLTRFormatting(&homepage);
       suggest_home_page->SetString(L"homePage", homepage);
       // TODO(tc): we actually want the unicode hostname
       suggest_home_page->SetString(L"hostName",
           ASCIIToWide(failed_url.host()));
       error_strings->Set(L"suggestionsHomepage", suggest_home_page);
     }
   }
 
   if (options.suggestions & SUGGEST_LEARNMORE) {
     GURL learn_more_url;
@@ skipping 24 matching lines @@
 }
 
 void GetFormRepostErrorValues(const GURL& display_url,
                               DictionaryValue* error_strings) {
   bool rtl = LocaleIsRTL();
   error_strings->SetString(L"textdirection", rtl ? L"rtl" : L"ltr");
 
   std::wstring failed_url(ASCIIToWide(display_url.spec()));
   // URLs are always LTR.
   if (rtl)
-    l10n_util::WrapStringWithLTRFormatting(&failed_url);
+    base::i18n::WrapStringWithLTRFormatting(&failed_url);
   error_strings->SetString(
       L"title", l10n_util::GetStringF(IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
                                       failed_url.c_str()));
   error_strings->SetString(L"heading",
                            l10n_util::GetString(IDS_HTTP_POST_WARNING_TITLE));
   error_strings->SetString(L"suggestionsHeading", L"");
   DictionaryValue* summary = new DictionaryValue;
   summary->SetString(L"msg",
                      l10n_util::GetString(IDS_ERRORPAGES_HTTP_POST_WARNING));
   error_strings->Set(L"summary", summary);
 }