Revert of Revert vector icon CLs.

ui/gfx/gfx.gyp

 # Copyright (c) 2013 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': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 76 matching lines @@
       # text_elider.h includes ICU headers.
       'export_dependent_settings': [
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
         '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
       ],
       'defines': [
         'GFX_IMPLEMENTATION',
       ],
       'include_dirs': [
-        '<(DEPTH)/third_party/icu/source/common'
+        '<(DEPTH)/third_party/icu/source/common',
       ],
       'sources': [
         'android/device_display_info.cc',
         'android/device_display_info.h',
         'android/gfx_jni_registrar.cc',
         'android/gfx_jni_registrar.h',
         'android/java_bitmap.cc',
         'android/java_bitmap.h',
         'android/shared_device_display_info.cc',
         'android/shared_device_display_info.h',
@@ skipping 290 matching lines @@
         ['OS=="android" or OS=="ios"', {
           'sources!': [
             'harfbuzz_font_skia.cc',
             'harfbuzz_font_skia.h',
             'render_text.cc',
             'render_text.h',
             'render_text_harfbuzz.cc',
             'render_text_harfbuzz.h',
             'text_utils_skia.cc',
           ],
+        }, {  # desktop platforms
+          'variables': {
+            'vector_icons_cc_file': '<(INTERMEDIATE_DIR)/ui/gfx/vector_icons.cc',
+            'vector_icons_public_h_file': '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/vector_icons_public.h',
+          },
+          'include_dirs': [
+            '<(SHARED_INTERMEDIATE_DIR)>',
+          ],
+          'sources': [
+            '<(vector_icons_cc_file)',
+            '<(vector_icons_public_h_file)',
+
+            'paint_vector_icon.cc',
+            'paint_vector_icon.h',
+            'vector_icons.h',
+          ],
+          'actions': [
+            {
+              # GN version: //ui/gfx:aggregate_vector_icons
+              'action_name': 'aggregate_vector_icons',
+              'inputs': [
+                'vector_icons/',
+              ],
+              'outputs': [
+                '<(vector_icons_cc_file)',
+                '<(vector_icons_public_h_file)',
+              ],
+              'action': [ 'python',
+                          'vector_icons/aggregate_vector_icons.py',
+                          '--working_directory=vector_icons/',
+                          '--output_cc=<(vector_icons_cc_file)',
+                          '--output_h=<(vector_icons_public_h_file)',
+              ],
+              'message': 'Aggregating vector resources.',
+            },
+          ],
         }],
         ['use_x11==1', {
           'dependencies': [
             '../../build/linux/system.gyp:x11',
             'x/gfx_x11.gyp:gfx_x11',
           ],
         }],
         ['use_cairo==1', {
           'dependencies': [
             '<(DEPTH)/build/linux/system.gyp:pangocairo',
@@ skipping 71 matching lines @@
          ],
          'variables': {
            'jni_gen_package': 'ui/gfx',
          },
          'includes': [ '../../build/jni_generator.gypi' ],
        },
      ],
     }],
   ],
 }