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

ui/base/l10n/l10n_util.cc

 // Copyright (c) 2011 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 "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>
 #include <cstdlib>
 #include <iterator>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 383 matching lines @@
   // On ChromeOS, use the application locale preference.
   if (!pref_locale.empty())
     candidates.push_back(pref_locale);
 
 #elif defined(OS_ANDROID)
 
   // TODO(jcivelli): use the application locale preference for now.
   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.
   // We used to use our custom parsing code along with ICU for this purpose.
   // If we have a port that does not depend on GTK, we have to
   // restore our custom code for that port.
   const char* const* languages = g_get_language_names();
   DCHECK(languages);  // A valid pointer is guaranteed.
   DCHECK(*languages);  // At least one entry, "C", is guaranteed.
 
@@ skipping 394 matching lines @@
   for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) {
     if (!IsLocaleNameTranslated(kAcceptLanguageList[i], display_locale))
       // TODO(jungshik) : Put them at the of the list with language codes
       // enclosed by brackets instead of skipping.
         continue;
     locale_codes->push_back(kAcceptLanguageList[i]);
   }
 }
 
 }  // namespace l10n_util