GMC: Relocate enter_pip icon and exit_pip icon.

Relocate enter_pip and exit_pip icon to
components/media_message_center/vector_icons/
since these two icons are not generic icons from
material.io/resources/icons.

Bug: 1047479
Change-Id: I1d93e117720701854fe4bbbe822596e49f8213da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2183092Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Tommy Steimel <steimel@chromium.org>
Commit-Queue: Jazz Xu <jazzhsu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#766509}

components/media_message_center/BUILD.gn

@@ -27,6 +27,7 @@ component("media_message_center") {
 
   deps = [
     "//base",
+    "//components/media_message_center/vector_icons",
     "//components/strings:components_strings_grit",
     "//components/vector_icons",
     "//services/media_session/public/cpp",

components/media_message_center/media_notification_view_impl.cc

@@ -11,6 +11,7 @@
 #include "components/media_message_center/media_notification_container.h"
 #include "components/media_message_center/media_notification_item.h"
 #include "components/media_message_center/media_notification_util.h"
+#include "components/media_message_center/vector_icons/vector_icons.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/vector_icons/vector_icons.h"
 #include "services/media_session/public/mojom/media_session.mojom.h"
@@ -74,9 +75,9 @@ const gfx::VectorIcon* GetVectorIconForMediaAction(MediaSessionAction action) {
     case MediaSessionAction::kNextTrack:
       return &vector_icons::kMediaNextTrackIcon;
     case MediaSessionAction::kEnterPictureInPicture:
-      return &vector_icons::kMediaEnterPipIcon;
+      return &kMediaEnterPipIcon;
     case MediaSessionAction::kExitPictureInPicture:
-      return &vector_icons::kMediaExitPipIcon;
+      return &kMediaExitPipIcon;
     case MediaSessionAction::kStop:
     case MediaSessionAction::kSkipAd:
     case MediaSessionAction::kSeekTo:

components/media_message_center/vector_icons/BUILD.gn

+# Copyright 2020 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")
+
+aggregate_vector_icons("media_vector_icons") {
+  icon_directory = "."
+
+  icons = [
+    "media_enter_pip.icon",
+    "media_exit_pip.icon",
+  ]
+}
+
+source_set("vector_icons") {
+  sources = get_target_outputs(":media_vector_icons")
+
+  deps = [
+    ":media_vector_icons",
+    "//base",
+    "//skia",
+    "//ui/gfx",
+  ]
+}

components/media_message_center/vector_icons/vector_icons.cc.template

+// Copyright 2020 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 "components/media_message_center/vector_icons/vector_icons.h"
+
+#include "base/logging.h"
+#include "components/vector_icons/cc_macros.h"
+#include "ui/gfx/vector_icon_types.h"
+
+#define DECLARE_VECTOR_COMMAND(x) using gfx::x;
+DECLARE_VECTOR_COMMANDS
+
+namespace media_message_center {
+
+TEMPLATE_PLACEHOLDER
+
+}

components/media_message_center/vector_icons/vector_icons.h.template

+// Copyright 2020 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 COMPONENTS_MEDIA_MESSAGE_CENTER_VECTOR_ICONS_H_
+#define COMPONENTS_MEDIA_MESSAGE_CENTER_VECTOR_ICONS_H_
+
+namespace gfx {
+struct VectorIcon;
+}
+
+namespace media_message_center {
+
+#define VECTOR_ICON_TEMPLATE_H(icon_name) \
+extern const gfx::VectorIcon icon_name;
+
+TEMPLATE_PLACEHOLDER
+
+#undef VECTOR_ICON_TEMPLATE_H
+
+}
+
+#endif  // COMPONENTS_MEDIA_MESSAGE_CENTER_VECTOR_ICONS_H_

components/vector_icons/BUILD.gn

@@ -47,8 +47,6 @@ aggregate_vector_icons("components_vector_icons") {
     "lightbulb_outline.icon",
     "location_on.icon",
     "lock.icon",
-    "media_enter_pip.icon",
-    "media_exit_pip.icon",
     "media_next_track.icon",
     "media_previous_track.icon",
     "media_router_active.icon",