[chromeos]Set GtkWidget's default direction correctly.

base/i18n/rtl.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 "base/i18n/rtl.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/sys_string_conversions.h"
 #include "unicode/coll.h"
 #include "unicode/locid.h"
 #include "unicode/uchar.h"
 #include "unicode/uscript.h"
 
-#if defined(TOOLKIT_GTK)
+#if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
 namespace base {
 namespace i18n {
 
 // Represents the locale-specific ICU text direction.
 static TextDirection g_icu_text_direction = UNKNOWN_DIRECTION;
 
 void GetLanguageAndRegionFromOS(std::string* lang, std::string* region) {
@@ skipping 40 matching lines @@
 void SetICUDefaultLocale(const std::string& locale_string) {
   icu::Locale locale(ICULocaleName(locale_string).c_str());
   UErrorCode error_code = U_ZERO_ERROR;
   icu::Locale::setDefault(locale, error_code);
   // This return value is actually bogus because Locale object is
   // an ID and setDefault seems to always succeed (regardless of the
   // presence of actual locale data). However,
   // it does not hurt to have it as a sanity check.
   DCHECK(U_SUCCESS(error_code));
   g_icu_text_direction = UNKNOWN_DIRECTION;
+
+  // If we use Views toolkit on top of GtkWidget, then we need to keep
+  // GtkWidget's default text direction consistent with ICU's text direction.
+  // Because in this case ICU's text direction will be used instead.
+  // See IsRTL() function below.
+#if defined(TOOLKIT_USES_GTK) && !defined(TOOLKIT_GTK)
+  gtk_widget_set_default_direction(
+      ICUIsRTL() ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR);
+#endif
 }
 
 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
 }
@@ skipping 189 matching lines @@
       begin == kRightToLeftOverride)
     ++begin_index;
   size_t end_index = text.length() - 1;
   if (text[end_index] == kPopDirectionalFormatting)
     --end_index;
   return text.substr(begin_index, end_index - begin_index + 1);
 }
 
 }  // namespace i18n
 }  // namespace base