Move a bunch of ash-only vector icons to ash/.

ash/common/system/tray/tray_notification_view.cc

 // Copyright (c) 2012 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.
 
 #include "ash/common/system/tray/tray_notification_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/resources/vector_icons/vector_icons.h"
 #include "grit/ash_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace ash {
 
 namespace {
 
 // Maps a non-MD PNG resource id to its corresponding MD vector icon id.

[tdanderson, 2016/09/07 22:36:13]

same as previous comment

[Evan Stade, 2016/09/07 22:41:52]

Done.

 // TODO(tdanderson): Remove this once material design is enabled by
 // default. See crbug.com/614453.
-gfx::VectorIconId ResourceIdToVectorIconId(int resource_id) {
-  gfx::VectorIconId vector_id = gfx::VectorIconId::VECTOR_ICON_NONE;
+const gfx::VectorIcon& ResourceIdToVectorIcon(int resource_id) {
   switch (resource_id) {
     case IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK:
-      return gfx::VectorIconId::SYSTEM_MENU_ACCESSIBILITY;
+      return kSystemMenuAccessibilityIcon;
 #if defined(OS_CHROMEOS)
     case IDR_AURA_UBER_TRAY_SMS:
-      return gfx::VectorIconId::SYSTEM_MENU_SMS;
+      return kSystemMenuSmsIcon;
 #endif
     default:
       NOTREACHED();
       break;
   }
 
-  return vector_id;
+  return gfx::kNoneIcon;
 }
 
 }  // namespace
 
 TrayNotificationView::TrayNotificationView(SystemTrayItem* owner, int icon_id)
     : owner_(owner), icon_id_(icon_id), icon_(NULL), autoclose_delay_(0) {}
 
 TrayNotificationView::~TrayNotificationView() {}
 
 void TrayNotificationView::InitView(views::View* contents) {
   set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 
   views::GridLayout* layout = new views::GridLayout(this);
   SetLayoutManager(layout);
 
   views::ImageButton* close_button = new views::ImageButton(this);
   close_button->SetImage(
       views::CustomButton::STATE_NORMAL,
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(IDR_MESSAGE_CLOSE));
   close_button->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                                   views::ImageButton::ALIGN_MIDDLE);
 
   icon_ = new views::ImageView;
   if (icon_id_ != 0) {
     if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-      icon_->SetImage(gfx::CreateVectorIcon(ResourceIdToVectorIconId(icon_id_),
+      icon_->SetImage(gfx::CreateVectorIcon(ResourceIdToVectorIcon(icon_id_),
                                             kMenuIconColor));
     } else {
       icon_->SetImage(
           ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon_id_));
     }
   }
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
 
   columns->AddPaddingColumn(0, kTrayPopupPaddingHorizontal / 2);
@@ skipping 87 matching lines @@
   OnClose();
   owner_->HideNotificationView();
 }
 
 void TrayNotificationView::HandleClickAction() {
   HandleClose();
   OnClickAction();
 }
 
 }  // namespace ash