ui/base/l10n/l10n_util.cc - Issue 6990051: Unix ifdefs patch for ui/ and webkit/

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 6990051: Unix ifdefs patch for ui/ and webkit/ (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: removed some too general ifdefs and ppapi changes Created 9 years, 7 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 dc5f8d67a5ca57318d9e858f50ad21c67e1293e9..3dbce9adf71c09495e0ba7dc075b34c47988b284 100644

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

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

@@ -320,7 +320,7 @@ bool CheckAndResolveLocale(const std::string& locale,

// if "foo bar" is RTL. So this function prepends the necessary RLM in such

// cases.

void AdjustParagraphDirectionality(string16* paragraph) {

-#if defined(OS_LINUX)

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

if (base::i18n::IsRTL() &&

base::i18n::StringContainsStrongRTLChars(*paragraph)) {

paragraph->insert(0, 1, static_cast<char16>(base::i18n::kRightToLeftMark));