Fix branding in chromoting string resources

build/grit_action.gypi

Index: build/grit_action.gypi
diff --git a/build/grit_action.gypi b/build/grit_action.gypi
index 0f0d7798e0a42a69374b9670d9c499351547b5df..af1b4d7ac9dd83dccc1f0073d7b055f3f4fa3ec2 100644
--- a/build/grit_action.gypi
+++ b/build/grit_action.gypi
@@ -16,16 +16,19 @@
 {
   'variables': {
     'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'],
+    'grit_resource_ids%': 'GRIT_DIR/../gritsettings/resource_ids',

[tony, 2012/11/01 23:29:15]

Do you need the %? I thought that meant you could override a value from the
command line.

[Sergey Ulanov, 2012/11/01 23:34:38]

No, grit substitutes GRIT_DIR internally.

[tony, 2012/11/01 23:36:51]

Sorry, I was asking about the % in grit_resource_ids%.

[Sergey Ulanov, 2012/11/01 23:41:45]

% means don't override the variable if it's already defined. That allows to
define this value in remoting.gyp, while all other gyp files will be using the
default resource_ids.  remoting.gyp sets grit_resource_ids to be empty,
otherwise grit complains when it finds "first_id" in grd file.

   },
   'inputs': [
-    '<!@pymod_do_main(grit_info <@(grit_defines) --inputs <(grit_grd_file))',
+    '<!@pymod_do_main(grit_info <@(grit_defines) --inputs <(grit_grd_file) '
+        '-f "<(grit_resource_ids)")',
   ],
   'outputs': [
-    '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' <(grit_grd_file))',
+    '<!@pymod_do_main(grit_info <@(grit_defines) --outputs \'<(grit_out_dir)\' '
+        '<(grit_grd_file) -f "<(grit_resource_ids)")',
   ],
   'action': ['<@(grit_cmd)',
              '-i', '<(grit_grd_file)', 'build',
-             '-fGRIT_DIR/../gritsettings/resource_ids',
+             '-f', '<(grit_resource_ids)',
              '-o', '<(grit_out_dir)',
              '<@(grit_defines)' ],
   'msvs_cygwin_shell': 0,