ui/base/strings/app_locale_settings.grd - Issue 14834011: Android: use grit target platform instead of define.

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/strings/app_locale_settings.grd

Issue 14834011: Android: use grit target platform instead of define. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add missed pp_ifdef(android) Created 7 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/strings/app_locale_settings.grd

diff --git a/ui/base/strings/app_locale_settings.grd b/ui/base/strings/app_locale_settings.grd

index 948935c589b1009973179c27626fd7b8508a0472..2b862d50cb3dc0f7ee2f7afb7dea26c941777ae4 100644

--- a/ui/base/strings/app_locale_settings.grd

+++ b/ui/base/strings/app_locale_settings.grd

@@ -223,7 +223,7 @@

75%

</message>

</if>

- <if expr="is_linux and not pp_ifdef('chromeos')">

+ <if expr="(is_linux or is_android) and not pp_ifdef('chromeos')">

<!-- The font used in Web UI (e.g. History). Note that these are only

backups. We try to use the system font if possible. -->

« no previous file with comments | « content/content_resources.grd ('k') | webkit/glue/resources/webkit_resources.grd » ('j') | no next file with comments »