Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / base / i18n / rtl.cc

diff --git a/src/base/i18n/rtl.cc b/src/base/i18n/rtl.cc
index 84dc51f..392cb13 100644 (file)
--- a/src/base/i18n/rtl.cc
+++ b/src/base/i18n/rtl.cc
@@ -14,10 +14,6 @@
 #include "third_party/icu/source/common/unicode/uscript.h"
 #include "third_party/icu/source/i18n/unicode/coll.h"
 
-#if defined(TOOLKIT_GTK)
-#include <gtk/gtk.h>
-#endif
-
 namespace {
 
 // Extract language, country and variant, but ignore keywords.  For example,
@@ -37,7 +33,7 @@ std::string GetLocaleString(const icu::Locale& locale) {
 
   if (variant != NULL && *variant != '\0') {
     std::string variant_str(variant);
-    StringToLowerASCII(&variant_str);
+    base::StringToLowerASCII(&variant_str);
     result += '@' + variant_str;
   }
 
@@ -123,12 +119,7 @@ void SetICUDefaultLocale(const std::string& locale_string) {
 }
 
 bool IsRTL() {
-#if defined(TOOLKIT_GTK)
-  GtkTextDirection gtk_dir = gtk_widget_get_default_direction();
-  return gtk_dir == GTK_TEXT_DIR_RTL;
-#else
   return ICUIsRTL();
-#endif
 }
 
 bool ICUIsRTL() {