ui/base/l10n/l10n_util.cc - Issue 16206002: Add more support for FreeBSD

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 16206002: Add more support for FreeBSD (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use os_posix and exclude other platforms as needed Created 7 years, 4 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 513a615a14166e5e335b59203ab5899e1f7e4402..bffb898ecb6b58a5262fda4c83eed46573c7b646 100644

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

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

@@ -35,7 +35,8 @@

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

#endif

-#if defined(OS_LINUX)

+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \

+ !defined(OS_NACL)

#include <glib.h>

#endif

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

// On Android, query java.util.Locale for the default locale.

candidates.push_back(GetDefaultLocale());

-#elif defined(OS_LINUX)

+#elif defined(OS_POSIX) && !defined(OS_NACL)

// If we're on a different Linux system, we have glib.

// GLib implements correct environment variable parsing with