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

tools/gritsettings/resource_ids

 # 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.
 #
 # This file is used to assign starting resource ids for resources and strings
 # used by Chromium.  This is done to ensure that resource ids are unique
 # across all the grd files.  If you are adding a new grd file, please add
 # a new entry to this file.
 #
 # The first entry in the file, SRCDIR, is special: It is a relative path from
@@ skipping 30 matching lines @@
     "includes": [4000],
   },
   "webkit/glue/webkit_resources.grd": {
     "includes": [4500],
   },
   "webkit/tools/test_shell/test_shell_resources.grd": {
     "includes": [5000],
   },
   "ui/resources/ui_resources.grd": {
     "includes": [5500],
+    "structures": [24000],
   },
   "chrome/app/theme/theme_resources.grd": {
     "includes": [6000],
+    "structures": [21000],
   },
   "chrome_frame/resources/chrome_frame_resources.grd": {
     "includes": [6500],
   },
   # WebKit.grd can be in two different places depending on whether we are
   # in a chromium checkout or a webkit-only checkout.
   "third_party/WebKit/Source/WebKit/chromium/WebKit.grd": {
     "includes": [7000],
   },
   "WebKit.grd": {
@@ skipping 76 matching lines @@
   },
   # This file is generated during the build.
   # devtools_resources.grd can be in two different places depending on whether
   # we are in a chromium checkout or a webkit-only checkout.
   "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
     "includes": [20500],
   },
   "devtools_resources.grd": {
     "includes": [20500],
   },
-  "chrome/app/theme/theme_resources_standard.grd": {
-    "structures": [21000],
-  },
   # This file is generated during the build.
   "chrome/browser/debugger/frontend/devtools_discovery_page_resources.grd": {
     "includes": [21500],
   },
   "chrome/browser/resources/options_resources.grd": {
     "includes": [22000],
   },
   "chrome/browser/resources/options2_resources.grd": {
     "structures": [22200],
   },
   "cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": {
     "messages": [22500],
   },
   "chrome/browser/resources/quota_internals_resources.grd": {
     "includes": [23000],
   },
-  "ui/resources/ui_resources_standard.grd": {
-    "structures": [24000],
-  },
   "content/content_resources.grd": {
     "includes": [24500],
   },
   "content/shell/shell_resources.grd": {
     "includes": [25000],
   },
   "ash/ash_strings.grd": {
     "messages": [25500],
   },
   "chrome/common/extensions_api_resources.grd": {
     "includes": [26000],
   },
   "third_party/trace-viewer/src/tracing.grd": {
     "includes": [26500],
   },
 }