ui/base/l10n/l10n_util.cc - Issue 7977025: aura: Make 'ui' buildable without gtk.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/base/l10n/l10n_util.cc

Issue 7977025: aura: Make 'ui' buildable without gtk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 9 years, 3 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:

Index: ui/base/l10n/l10n_util.cc

diff --git a/ui/base/l10n/l10n_util.cc b/ui/base/l10n/l10n_util.cc

index 795153439a641a24d60c2ccb4b514e64272ef72e..2c2ac796e1621dbd335686646b983049cd2b6f9f 100644

--- a/ui/base/l10n/l10n_util.cc

+++ b/ui/base/l10n/l10n_util.cc

@@ -4,7 +4,7 @@

#include "ui/base/l10n/l10n_util.h"

-#if defined(TOOLKIT_USES_GTK)

+#if defined(USE_X11)

#include <glib/gutils.h>

#endif

@@ -404,7 +404,7 @@ std::string GetApplicationLocale(const std::string& pref_locale) {

if (!pref_locale.empty())

candidates.push_back(pref_locale);

-#elif defined(OS_POSIX) && defined(TOOLKIT_USES_GTK)

+#elif !defined(OS_MACOSX)

// GLib implements correct environment variable parsing with

// the precedence order: LANGUAGE, LC_ALL, LC_MESSAGES and LANG.

« no previous file with comments | « ui/base/dragdrop/os_exchange_data.h ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »