diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 01:50:11 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 01:50:11 +0000 |
| commit | 1a8843ed82923004bbd30d9a198949d9e9ecb93a (patch) | |
| tree | bc233eedb1bf0b1f301da49cbba02252441c15ac /ui | |
| parent | d9a32ced0f5e313a898f99c1a6347a7649fb1d0a (diff) | |
| download | chromium_src-1a8843ed82923004bbd30d9a198949d9e9ecb93a.zip chromium_src-1a8843ed82923004bbd30d9a198949d9e9ecb93a.tar.gz chromium_src-1a8843ed82923004bbd30d9a198949d9e9ecb93a.tar.bz2 | |
Change include for g_get_language_names from glib/gutils.h to glib.h.
The function moved headers in newer glibs.
Also fix up the #ifs to be more focused.
Remove ui/base/OWNERS since it's identical to ui/OWNERS.
Add ui/base/l10n/OWNERS and put myself in it.
BUG=None
Review URL: http://codereview.chromium.org/9360031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/OWNERS | 3 | ||||
| -rw-r--r-- | ui/base/l10n/OWNERS | 1 | ||||
| -rw-r--r-- | ui/base/l10n/l10n_util.cc | 12 |
3 files changed, 7 insertions, 9 deletions
diff --git a/ui/base/OWNERS b/ui/base/OWNERS deleted file mode 100644 index 2094d73..0000000 --- a/ui/base/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -set noparent
-ben@chromium.org
-sky@chromium.org
diff --git a/ui/base/l10n/OWNERS b/ui/base/l10n/OWNERS new file mode 100644 index 0000000..086939c --- /dev/null +++ b/ui/base/l10n/OWNERS @@ -0,0 +1 @@ +tony@chromium.org diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc index 28dbc43..1239085 100644 --- a/ui/base/l10n/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -1,13 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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> -#endif - #include <algorithm> #include <cstdlib> #include <iterator> @@ -30,6 +26,10 @@ #include "unicode/rbbi.h" #include "unicode/uloc.h" +#if defined(TOOLKIT_GTK) +#include <glib.h> +#endif + #if defined(OS_WIN) #include "ui/base/l10n/l10n_util_win.h" #endif // OS_WIN @@ -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. |