Create a vector icon target for ash icons also used in Chrome.

TBR=bsep@chromium.org

Bug: none
Change-Id: I476b92e6ffe329632b6d9551b28bfea0ba1fb067
Reviewed-on: https://chromium-review.googlesource.com/902729Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534732}

ash/BUILD.gn

@@ -1027,6 +1027,7 @@ component("ash") {
 
   public_deps = [
     "//ash/public/cpp",
+    "//ash/public/cpp/vector_icons",
     "//ash/resources",
     "//ash/resources/vector_icons",
     "//ash/strings",
@@ -1573,6 +1574,7 @@ test("ash_unittests") {
     "//ash/autoclick/common:autoclick",
     "//ash/public/cpp",
     "//ash/public/cpp:unit_tests",
+    "//ash/public/cpp/vector_icons",
     "//ash/resources",
     "//ash/resources/vector_icons",
     "//ash/strings",

ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc

@@ -6,7 +6,7 @@
 
 #include "ash/ash_layout_constants.h"
 #include "ash/frame/caption_buttons/frame_caption_button.h"
-#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/public/cpp/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"

ash/frame/caption_buttons/frame_size_button_unittest.cc

@@ -7,7 +7,7 @@
 #include "ash/ash_layout_constants.h"
 #include "ash/frame/caption_buttons/frame_caption_button.h"
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/public/cpp/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_state.h"

ash/frame/default_frame_header.cc

@@ -8,8 +8,8 @@
 #include "ash/frame/caption_buttons/frame_caption_button.h"
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/frame_header_util.h"
+#include "ash/public/cpp/vector_icons/vector_icons.h"
 #include "ash/resources/grit/ash_resources.h"
-#include "ash/resources/vector_icons/vector_icons.h"
 #include "base/debug/leak_annotations.h"
 #include "base/logging.h"  // DCHECK
 #include "third_party/skia/include/core/SkPath.h"

ash/public/cpp/vector_icons/BUILD.gn

+# Copyright 2018 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("//components/vector_icons/vector_icons.gni")
+
+# The icons in this target, unlike those in //ash/resources/vector_icons, are ok to use from outside of ash/.
+aggregate_vector_icons("ash_public_vector_icons") {
+  icon_directory = "."
+
+  icons = [
+    "window_control_left_snapped.1x.icon",
+    "window_control_left_snapped.icon",
+    "window_control_right_snapped.1x.icon",
+    "window_control_right_snapped.icon",
+    "window_control_close.1x.icon",
+    "window_control_close.icon",
+    "window_control_maximize.1x.icon",
+    "window_control_maximize.icon",
+    "window_control_minimize.1x.icon",
+    "window_control_minimize.icon",
+    "window_control_restore.1x.icon",
+    "window_control_restore.icon",
+  ]
+}
+
+source_set("vector_icons") {
+  sources = get_target_outputs(":ash_public_vector_icons")
+
+  deps = [
+    ":ash_public_vector_icons",
+    "//base",
+    "//skia",
+    "//ui/gfx",
+  ]
+}

ash/public/cpp/vector_icons/vector_icons.cc.template

+// Copyright 2018 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.
+
+// vector_icons.cc.template is used to generate vector_icons.cc. Edit the former
+// rather than the latter.
+
+#include "ash/public/cpp/vector_icons/vector_icons.h"
+
+#include "base/logging.h"
+#include "ui/gfx/vector_icon_types.h"
+
+#define PATH_ELEMENT_TEMPLATE(path_name, ...) \
+static constexpr gfx::PathElement path_name[] = {__VA_ARGS__};
+
+#define VECTOR_ICON_TEMPLATE(icon_name, path_name, path_name_1x) \
+const gfx::VectorIcon icon_name = { path_name , path_name_1x };
+
+namespace ash {
+
+using namespace gfx;
+
+TEMPLATE_PLACEHOLDER
+
+}  // namespace ash

ash/public/cpp/vector_icons/vector_icons.h.template

+// Copyright 2018 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.
+
+// vector_icons.h.template is used to generate vector_icons.h. Edit the former
+// rather than the latter.
+
+#ifndef ASH_PUBLIC_CPP_VECTOR_ICONS_VECTOR_ICONS_H_
+#define ASH_PUBLIC_CPP_VECTOR_ICONS_VECTOR_ICONS_H_
+
+namespace gfx {
+struct VectorIcon;
+}
+
+#define VECTOR_ICON_TEMPLATE_H(icon_name) \
+extern const gfx::VectorIcon icon_name;
+
+namespace ash {
+
+TEMPLATE_PLACEHOLDER
+
+}  // namespace ash
+
+#undef VECTOR_ICON_TEMPLATE_H
+
+#endif  // ASH_PUBLIC_CPP_VECTOR_ICONS_VECTOR_ICONS_H_

ash/resources/vector_icons/BUILD.gn

@@ -293,18 +293,6 @@ aggregate_vector_icons("ash_vector_icons") {
     "tray_action_new_lock_screen_note.icon",
     "window_control_back.1x.icon",
     "window_control_back.icon",
-    "window_control_close.1x.icon",
-    "window_control_close.icon",
-    "window_control_left_snapped.1x.icon",
-    "window_control_left_snapped.icon",
-    "window_control_maximize.1x.icon",
-    "window_control_maximize.icon",
-    "window_control_minimize.1x.icon",
-    "window_control_minimize.icon",
-    "window_control_restore.1x.icon",
-    "window_control_restore.icon",
-    "window_control_right_snapped.1x.icon",
-    "window_control_right_snapped.icon",
   ]
 
   if (is_chrome_branded) {

ash/wm/overview/window_selector_item.cc

@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "ash/public/cpp/shell_window_ids.h"
+#include "ash/public/cpp/vector_icons/vector_icons.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/strings/grit/ash_strings.h"

chrome/browser/ui/BUILD.gn

@@ -2110,6 +2110,7 @@ split_static_library("ui") {
       "//ash",
       "//ash:ash_with_content",
       "//ash/public/cpp",
+      "//ash/public/cpp/vector_icons",
       "//ash/resources/vector_icons",
       "//ash/strings",
       "//chrome/browser/chromeos",

chrome/browser/ui/views/frame/browser_frame_header_ash.cc

@@ -8,7 +8,7 @@
 #include "ash/frame/caption_buttons/frame_caption_button.h"
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/frame_header_util.h"
-#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/public/cpp/vector_icons/vector_icons.h"
 #include "base/logging.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"