Move around more vector icons.

components/omnibox/browser/BUILD.gn

Index: components/omnibox/browser/BUILD.gn
diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
index b0e6a38ed132403a7fb877620cf683b29fda00a2..7b0fc114f033784984667a879bb88b435ae636c5 100644
--- a/components/omnibox/browser/BUILD.gn
+++ b/components/omnibox/browser/BUILD.gn
@@ -8,6 +8,46 @@ if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
+action("aggregate_vector_icons") {
+  visibility = [ ":*" ]
+
+  script = "//ui/gfx/vector_icons/aggregate_vector_icons.py"
+
+  icons = [
+    "vector_icons/calculator.1x.icon",
+    "vector_icons/calculator.icon",
+    "vector_icons/extension_app.1x.icon",
+    "vector_icons/extension_app.icon",
+    "vector_icons/http.icon",
+    "vector_icons/keyword_search.icon",
+    "vector_icons/search.icon",
+    "vector_icons/star.1x.icon",
+    "vector_icons/star.icon",
+  ]
+
+  output_cc = "$target_gen_dir/vector_icons.cc"
+  output_h = "$target_gen_dir/vector_icons.h"
+
+  inputs = icons
+  inputs += [
+    "vector_icons/vector_icons.cc.template",
+    "vector_icons/vector_icons.h.template",
+  ]
+  outputs = [
+    output_cc,
+    output_h,
+  ]
+
+  response_file_contents = rebase_path(icons, root_build_dir)
+
+  args = [
+    "--working_directory=" + rebase_path("./vector_icons"),
+    "--file_list={{response_file_name}}",
+    "--output_cc=" + rebase_path(output_cc, root_build_dir),
+    "--output_h=" + rebase_path(output_h, root_build_dir),
+  ]
+}
+
 static_library("browser") {
   sources = [
     "answers_cache.cc",
@@ -109,6 +149,8 @@ static_library("browser") {
     "zero_suggest_provider.h",
   ]
 
+  defines = [ "OMNIBOX_BROWSER_IMPLEMENTATION" ]
+
   public_deps = [
     "//components/history/core/browser",
     "//components/metrics/proto",
@@ -145,6 +187,11 @@ static_library("browser") {
     "//url",
   ]
 
+  if (!is_android && !is_ios) {
+    sources += get_target_outputs(":aggregate_vector_icons")
+    deps += [ ":aggregate_vector_icons" ]
+  }
+
   # TODO(brettw) Fix the include cycle and remove this line.
   allow_circular_includes_from = [ "//components/search_engines" ]
 }