Change include for g_get_language_names from glib/gutils.h to glib.h.

ui/base/l10n/l10n_util.cc

Index: ui/base/l10n/l10n_util.cc
diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc
index 28dbc4301b92534a0506d973bb8a511bde5bfda8..4caf2131eec3fe51b9fb120755525773cee402f1 100644
--- a/ui/base/l10n/l10n_util.cc
+++ b/ui/base/l10n/l10n_util.cc
@@ -4,8 +4,8 @@
 
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(USE_X11)
-#include <glib/gutils.h>
+#if defined(TOOLKIT_GTK)
+#include <glib.h>
 #endif

[Evan Martin, 2012/02/08 22:04:23]

I think officially conditional headers belong down below by the OS_WIN
conditional header too

 
 #include <algorithm>
@@ -410,7 +410,7 @@ std::string GetApplicationLocale(const std::string& pref_locale) {
   if (!pref_locale.empty())
     candidates.push_back(pref_locale);
 
-#elif !defined(OS_MACOSX)
+#elif defined(TOOLKIT_GTK)
 
   // GLib implements correct environment variable parsing with
   // the precedence order: LANGUAGE, LC_ALL, LC_MESSAGES and LANG.