chrome/chrome.gyp - Issue 2774003: Merge 49236 - Add platform_locale_settings file for CrOS. This is necessary ...

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: chrome/chrome.gyp

Issue 2774003: Merge 49236 - Add platform_locale_settings file for CrOS. This is necessary ... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/418/src/

Patch Set: Created 10 years, 6 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/chrome.gyp

===================================================================

--- chrome/chrome.gyp (revision 49236)

+++ chrome/chrome.gyp (working copy)

@@ -76,8 +76,16 @@

'NACL_LINUX=1',

'NACL_OSX=0',

- 'platform_locale_settings_grd':

- 'app/resources/locale_settings_linux.grd',

+ 'conditions': [

+ ['chromeos==1', {

+ 'platform_locale_settings_grd':

+ 'app/resources/locale_settings_cros.grd',

+ }],

+ ['chromeos!=1', {

+ 'platform_locale_settings_grd':

+ 'app/resources/locale_settings_linux.grd',

+ }],

+ ],

},],

['OS=="mac"', {

'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist',

« no previous file with comments | « chrome/browser/tab_contents/web_contents_unittest.cc ('k') | no next file » | no next file with comments »