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

ui/views/views.gyp

Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 5c2641f35e3ba3e6347ceb66c3ae4fd2f8ef5e1d..4c93c26636d545e136e6af26bf83261fff04524c 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -38,7 +38,6 @@
         '../compositor/compositor.gyp:compositor',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
-        '../ui.gyp:ui_resources_standard',
       ],
       'defines': [
         'VIEWS_IMPLEMENTATION',
@@ -504,7 +503,6 @@
         '../compositor/compositor.gyp:compositor_test_support',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
-        '../ui.gyp:ui_resources_standard',
         '../ui.gyp:ui_test_support',
         'test_support_views',
         'views',
@@ -551,7 +549,6 @@
         'run_all_unittests.cc',
 
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
       'conditions': [
         ['OS=="win"', {
@@ -608,7 +605,6 @@
         '../../third_party/icu/icu.gyp:icuuc',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
-        '../ui.gyp:ui_resources_standard',
         'views',
       ],
       'include_dirs': [
@@ -692,7 +688,6 @@
         '../../third_party/icu/icu.gyp:icuuc',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
-        '../ui.gyp:ui_resources_standard',
         'views_examples_lib',
       ],
       'include_dirs': [
@@ -710,7 +705,6 @@
         'test/test_views_delegate.cc',
         'test/test_views_delegate.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
       'conditions': [
         ['OS=="win"', {