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

ash/common/system/chromeos/screen_security/screen_tray_item.cc

 // Copyright 2013 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/chromeos/screen_security/screen_tray_item.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/fixed_sized_image_view.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/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/message_center/message_center.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace {
 const int kStopButtonRightPadding = 18;
 }  // namespace
 
 namespace ash {
 namespace tray {
 
 // ScreenTrayView implementations.
 ScreenTrayView::ScreenTrayView(ScreenTrayItem* screen_tray_item)
     : TrayItemView(screen_tray_item), screen_tray_item_(screen_tray_item) {
   CreateImageView();
   if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-    image_view()->SetImage(gfx::CreateVectorIcon(
-        gfx::VectorIconId::SYSTEM_TRAY_SCREEN_SHARE, kTrayIconColor));
+    image_view()->SetImage(
+        gfx::CreateVectorIcon(kSystemTrayScreenShareIcon, kTrayIconColor));
   } else {
     image_view()->SetImage(ui::ResourceBundle::GetSharedInstance()
                                .GetImageNamed(IDR_AURA_UBER_TRAY_SCREENSHARE)
                                .ToImageSkia());
   }
   Update();
 }
 
 ScreenTrayView::~ScreenTrayView() {}
 
@@ skipping 44 matching lines @@
 }
 
 void ScreenStatusView::CreateItems() {
   set_background(views::Background::CreateSolidBackground(kBackgroundColor));
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                         kTrayPopupPaddingHorizontal, 0,
                                         kTrayPopupPaddingBetweenItems));
 
   icon_ = new FixedSizedImageView(0, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
   if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    icon_->SetImage(gfx::CreateVectorIcon(
-        gfx::VectorIconId::SYSTEM_MENU_SCREEN_SHARE, kMenuIconColor));
+    icon_->SetImage(
+        gfx::CreateVectorIcon(kSystemMenuScreenShareIcon, kMenuIconColor));
   } else {
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     icon_->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_SCREENSHARE_DARK)
                         .ToImageSkia());
   }
   AddChildView(icon_);
 
   label_ = new views::Label;
   label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label_->SetMultiLine(true);
@@ skipping 92 matching lines @@
 
   // Center the item dependent on the orientation of the shelf.
   views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment)
                                              ? views::BoxLayout::kHorizontal
                                              : views::BoxLayout::kVertical;
   tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));
   tray_view_->Layout();
 }
 
 }  // namespace ash