Merge grd files in ui/resources and chrome/app/theme

content/content_shell.gypi

 # 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': {
     'content_shell_product_name': 'Content Shell',
   },
   'targets': [
     {
@@ skipping 197 matching lines @@
     {
       # We build a minimal set of resources so WebKit in content_shell has
       # access to necessary resources.
       'target_name': 'content_shell_pak',
       'type': 'none',
       'dependencies': [
         'browser/debugger/devtools_resources.gyp:devtools_resources',
         'content_shell_resources',
         '<(DEPTH)/net/net.gyp:net_resources',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
-        '<(DEPTH)/ui/ui.gyp:ui_resources_standard',
       ],
       'variables': {
         'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
       },
       'actions': [
         {
           'action_name': 'repack_content_shell_pack',
           'variables': {
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
             ],
           },
           'inputs': [
             '<(repack_path)',
             '<@(pak_inputs)',
           ],
           'action': ['python', '<(repack_path)', '<@(_outputs)',
@@ skipping 369 matching lines @@
                 '-buildfile',
                 '<(DEPTH)/content/shell/android/java/content_shell_apk.xml',
               ]
             }
           ],
         },
       ],
     }],  # OS=="android"
   ]
 }