Refactor grit -D flags into a gyp variable so we don't

app/app.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': {
     # TODO: remove this helper when we have loops in GYP
     'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py',],
     'chromium_code': 1,
     'grit_info_cmd': ['python', '../tools/grit/grit_info.py',],
@@ skipping 91 matching lines @@
           'extension': 'grd',
           'inputs': [
             '<!@(<(grit_info_cmd) --inputs <(localizable_resources))',
           ],
           'outputs': [
             '<(grit_out_dir)/<(RULE_INPUT_ROOT)/grit/<(RULE_INPUT_ROOT).h',
             # TODO: remove this helper when we have loops in GYP
             '>!@(<(apply_locales_cmd) \'<(grit_out_dir)/<(RULE_INPUT_ROOT)/<(RULE_INPUT_ROOT)_ZZLOCALE.pak\' <(locales))',
           ],
           'action': ['<@(grit_cmd)', '-i', '<(RULE_INPUT_PATH)',
-            'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)'],
+            'build', '-o', '<(grit_out_dir)/<(RULE_INPUT_ROOT)',
+            '<@(grit_defines)'],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
-          'conditions': [
-            ['use_titlecase_in_grd_files==1', {
-              'action': ['-D', 'use_titlecase'],
-            }],
-            ['chromeos==1', {
-              'action': ['-D', 'chromeos'],
-            }],
-          ],
         },
       ],
       'sources': [
         '<@(localizable_resources)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(grit_out_dir)/app_locale_settings',
           '<(grit_out_dir)/app_strings',
         ],
@@ skipping 15 matching lines @@
             'input_path': 'resources/app_resources.grd',
           },
           'inputs': [
             '<!@(<(grit_info_cmd) --inputs <(input_path))',
           ],
           'outputs': [
             '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)/app_resources\' <(input_path))',
           ],
           'action': ['<@(grit_cmd)',
                      '-i', '<(input_path)', 'build',
-                     '-o', '<(grit_out_dir)/app_resources'],
-          'conditions': [
-            ['toolkit_views==1', {
-              'action': ['-D', 'toolkit_views'],
-            }],
-          ],
+                     '-o', '<(grit_out_dir)/app_resources',
+                     '<@(grit_defines)' ],
           'message': 'Generating resources from <(input_path)',
         },
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(grit_out_dir)/app_resources',
         ],
       },
       'conditions': [
         ['OS=="win"', {
@@ skipping 41 matching lines @@
       }],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: