Revert 162226 - Add common_resources.grd for non-localizeable chromoting resources.

remoting/remoting.gyp

 # Copyright (c) 2012 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(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
 
@@ skipping 1266 matching lines @@
                 '<(strings_grd_file)',
               ],
               'action': ['python', 'tools/remove_official_branding.py',
                          '<(base_strings_grd_file)', '<(strings_grd_file)' ],
             },
           ],
         }],
       ],
       'actions': [
         {
-          'action_name': 'string_resources',
+          'action_name': 'generate_resources',
           'variables': {
-            'grit_grd_file': '<(strings_grd_file)',
-            'base_grit_grd_file': '<(base_strings_grd_file)',
+            'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'],
           },
-          'includes': [ 'grit_action.gypi' ],
-        },
-        {
-          'action_name': 'common_resources',
-          'variables': {
-            'grit_grd_file': 'resources/common_resources.grd',
-            'base_grit_grd_file': 'resources/common_resources.grd',
-          },
-          'includes': [ 'grit_action.gypi' ],
+          'inputs': [
+            '<(strings_grd_file)',
+            '<(resource_ids_file)',
+          ],
+          'outputs': [
+            '<!@pymod_do_main(grit_info <@(grit_defines) '
+            '--outputs \'<(grit_out_dir)\' <(base_strings_grd_file))',
+          ],
+          'action': ['<@(grit_cmd)',
+                     '-i', '<(strings_grd_file)', 'build',
+                     '-fresource_ids',
+                     '-o', '<(grit_out_dir)',
+                     '<@(grit_defines)' ],
+          'msvs_cygwin_shell': 0,
+          'message': 'Generating resources from <(strings_grd_file)',
         },
       ],
       'copies': [
-        # Copy results to the product directory.
-        {
+        {  # Copy results to the product directory.
           'destination': '<(PRODUCT_DIR)/remoting_locales',
           'files': [
             '<(grit_out_dir)/remoting/resources/en-US.pak',
           ]
         },
-        {
-          'destination': '<(PRODUCT_DIR)',
-          'files': [
-            '<(grit_out_dir)/remoting/resources/chrome_remote_desktop.pak',
-          ]
-        },
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },  # end of target 'remoting_resources'
 
     {
       'target_name': 'remoting_base',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '../base/base.gyp:base',
@@ skipping 827 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }