Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1012)

Unified Diff: base/i18n/rtl.cc

Issue 9969080: Remove TOOLKIT_USES_GTK (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add gtk dependency to android linux host Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gypi ('k') | base/message_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/i18n/rtl.cc
diff --git a/base/i18n/rtl.cc b/base/i18n/rtl.cc
index 779ac3338c85c7076fdf81245ec4b970c23aef5b..29a2a88d555e6d2164b6f7acf23eba6631fc5890 100644
--- a/base/i18n/rtl.cc
+++ b/base/i18n/rtl.cc
@@ -14,7 +14,7 @@
#include "unicode/uchar.h"
#include "unicode/uscript.h"
-#if defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_GTK)
#include <gtk/gtk.h>
#endif
@@ -100,15 +100,6 @@ void SetICUDefaultLocale(const std::string& locale_string) {
// 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() {
« no previous file with comments | « base/base.gypi ('k') | base/message_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698