Add copyright to icon files, sort BUILD.gn

BUG=822960
TEST=None

Change-Id: I63cb34bab20ba4801bed00ffd997063e6e45ef1e
Reviewed-on: https://chromium-review.googlesource.com/981909Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547731}

ash/frame/custom_frame_view_ash_unittest.cc

@@ -13,6 +13,7 @@
 #include "ash/frame/header_view.h"
 #include "ash/public/cpp/vector_icons/vector_icons.h"
 #include "ash/public/cpp/window_properties.h"
+#include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/overview/window_selector_controller.h"

ash/frame/default_frame_header.cc

@@ -11,6 +11,7 @@
 #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 "ash/shell.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "base/debug/leak_annotations.h"

ash/public/cpp/vector_icons/BUILD.gn

@@ -11,6 +11,8 @@ aggregate_vector_icons("ash_public_vector_icons") {
   icons = [
     "notification_captive_portal.icon",
     "notification_cellular_alert.icon",
+    "notification_download.icon",
+    "notification_end_of_support.icon",
     "notification_google.icon",
     "notification_image.icon",
     "notification_installed.icon",
@@ -25,18 +27,12 @@ aggregate_vector_icons("ash_public_vector_icons") {
     "notification_vpn.icon",
     "notification_warning.icon",
     "notification_wifi_off.icon",
-    "notification_download.icon",
-    "notification_end_of_support.icon",
-    "window_control_left_snapped.icon",
-    "window_control_right_snapped.icon",
     "window_control_close.icon",
+    "window_control_left_snapped.icon",
     "window_control_maximize.icon",
     "window_control_minimize.icon",
     "window_control_restore.icon",
-    "window_control_back.icon",
-    "window_control_menu.icon",
-    "window_control_zoom.icon",
-    "window_control_dezoom.icon",
+    "window_control_right_snapped.icon",
   ]
 }
 

ash/resources/vector_icons/BUILD.gn

@@ -168,6 +168,10 @@ aggregate_vector_icons("ash_vector_icons") {
     "touch_calibration_complete_check.icon",
     "touch_calibration_hand.icon",
     "tray_action_new_lock_screen_note.icon",
+    "window_control_back.icon",
+    "window_control_dezoom.icon",
+    "window_control_menu.icon",
+    "window_control_zoom.icon",
   ]
 
   if (is_chrome_branded) {

ash/public/cpp/vector_icons/window_control_dezoom.icon → ash/resources/vector_icons/window_control_dezoom.icon

+// 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.
+
 CANVAS_DIMENSIONS, 24,
 MOVE_TO, 14, 0,
 R_H_LINE_TO, 4,

ash/public/cpp/vector_icons/window_control_menu.icon → ash/resources/vector_icons/window_control_menu.icon

+// 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.
+
 CANVAS_DIMENSIONS, 24,
 MOVE_TO, 12, 6,
 R_CUBIC_TO, 1.65f, 0, 3, -1.35f, 3, -3,

ash/public/cpp/vector_icons/window_control_zoom.icon → ash/resources/vector_icons/window_control_zoom.icon

+// 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.
+
 CANVAS_DIMENSIONS, 24,
 MOVE_TO, 14, 0,
 R_H_LINE_TO, 10,