Revert of Revert vector icon CLs.

ui/gfx/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 # Several targets want to include this header file, and some of them are
 # child dependencies of "gfx". Therefore, we separate it out here so multiple
 # targets can all have a dependency for header checking purposes without
 # creating circular dependencies.
 source_set("gfx_export") {
   sources = [
     "gfx_export.h",
   ]
 }
 
+vector_icons_cc_file = "$target_gen_dir/vector_icons.cc"
+vector_icons_public_h_file = "$target_gen_dir/vector_icons_public.h"
+
 component("gfx") {
   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 281 matching lines @@
       "//base:base_java",
     ]
     libs = [
       "android",
       "jnigraphics",
     ]
   } else {
     sources -= [ "canvas_notimplemented.cc" ]
   }
 
+  # Desktop only.
+  if (use_aura || (!is_ios && !is_android)) {
+    sources += [
+      "paint_vector_icon.cc",
+      "paint_vector_icon.h",
+      "vector_icons.h",
+      vector_icons_cc_file,
+      vector_icons_public_h_file,
+    ]
+    deps += [ ":aggregate_vector_icons" ]
+  }
+
   # Windows.
   if (is_win) {
     cflags = [ "/wd4324" ]  # Structure was padded due to __declspec(align()), which is
                             # uninteresting.
   } else {
     sources -= [
       "gdi_util.cc",
       "gdi_util.h",
       "icon_util.cc",
       "icon_util.h",
@@ skipping 32 matching lines @@
     configs += [ "//build/config/linux:x11" ]
   } else {
     sources -= [ "path_x11.cc" ]
   }
 
   if (use_cairo) {
     configs += [ "//build/config/linux:pangocairo" ]
   }
 }
 
+# GYP version: ui/gfx/gfx.gyp:aggregate_vector_icons
+action("aggregate_vector_icons") {
+  script = "vector_icons/aggregate_vector_icons.py"
+  sources = [
+    "vector_icons",
+  ]
+  outputs = [
+    vector_icons_cc_file,
+    vector_icons_public_h_file,
+  ]
+
+  args = [
+    "--working_directory=" + rebase_path("vector_icons/"),
+    "--output_cc=" + rebase_path(vector_icons_cc_file, root_build_dir),
+    "--output_h=" + rebase_path(vector_icons_public_h_file, root_build_dir),
+  ]
+}
+
 # Looking for gfx_geometry? It's //ui/gfx/geometry:geometry
 
 source_set("test_support") {
   testonly = true
   sources = [
     "image/image_unittest_util.cc",
     "image/image_unittest_util.h",
     "image/image_unittest_util_ios.mm",
     "image/image_unittest_util_mac.mm",
     "test/fontconfig_util_linux.cc",
@@ skipping 166 matching lines @@
 if (is_android) {
   generate_jni("gfx_jni_headers") {
     sources = [
       "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
       "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
       "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
     ]
     jni_package = "gfx"
   }
 }