Merge 49236 - Add platform_locale_settings file for CrOS. This is necessary ...

chrome/chrome.gyp

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
       'version_path': 'VERSION',
@@ skipping 58 matching lines @@
         ],
         'platform_locale_settings_grd':
             'app/resources/locale_settings_win.grd',
       },],
       ['OS=="linux"', {
         'nacl_defines': [
           'NACL_WINDOWS=0',
           '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',
         'nacl_defines': [
           'NACL_WINDOWS=0',
           'NACL_LINUX=0',
           'NACL_OSX=1',
         ],
         'platform_locale_settings_grd':
             'app/resources/locale_settings_mac.grd',
@@ skipping 1630 matching lines @@
       }],  # targets
     }],  # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: