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

chrome/chrome_browser.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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 45 matching lines @@
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
         '../third_party/libusb/libusb.gyp:libusb',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/surface/surface.gyp:surface',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
-        '../ui/ui.gyp:ui_resources_standard',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:blob',
         '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:fileapi',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
         '../webkit/support/webkit_support.gyp:webkit_resources',
         '../webkit/support/webkit_support.gyp:webkit_user_agent',
@@ skipping 4197 matching lines @@
         'test/base/chrome_process_util.h',
         'test/base/chrome_process_util_mac.cc',
         'test/perf/perf_test.cc',
         'test/perf/perf_test.h',
 
         # These files are generated by GRIT.
         '<(grit_out_dir)/grit/component_extension_resources_map.cc',
         '<(grit_out_dir)/grit/devtools_discovery_page_resources_map.cc',
         '<(grit_out_dir)/grit/shared_resources_map.cc',
         '<(grit_out_dir)/grit/theme_resources_map.cc',
-        '<(grit_out_dir)/grit/theme_resources_standard_map.cc',
 
         # This file is generated by the autofill_regexes action.
         '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
       ],
       'conditions': [
         ['enable_extensions==1', {
           'sources': [
             # Only extension API implementations should go here.
             'browser/accessibility/accessibility_extension_api.cc',
             'browser/accessibility/accessibility_extension_api.h',
@@ skipping 1082 matching lines @@
         'browser/metrics/proto/study.proto',
       ],
       'variables': {
         'proto_in_dir': 'browser/metrics/proto',
         'proto_out_dir': 'chrome/browser/metrics/proto',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }