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

ash/common/system/cast/tray_cast.cc

 // Copyright 2015 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/cast/tray_cast.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/chromeos/screen_security/screen_tray_item.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/throbber_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/wm_shell.h"
+#include "ash/resources/vector_icons/vector_icons.h"
 #include "base/bind.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_elider.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 
 namespace ash {
 
 namespace {
 
@@ skipping 13 matching lines @@
 base::string16 ElideString(const base::string16& text) {
   base::string16 elided;
   gfx::ElideString(text, kMaximumStatusStringLength, &elided);
   return elided;
 }
 
 // Returns a vectorized version of the Cast icon. The icon's interior region is
 // filled in if |is_casting| is true.
 gfx::ImageSkia GetCastIconForSystemMenu(bool is_casting) {
   return gfx::CreateVectorIcon(
-      gfx::VectorIconId::SYSTEM_MENU_CAST,
-      is_casting ? kMenuIconColor : SK_ColorTRANSPARENT);
+      kSystemMenuCastIcon, is_casting ? kMenuIconColor : SK_ColorTRANSPARENT);
 }
 
 }  // namespace
 
 namespace tray {
 
 // This view is displayed in the system tray when the cast extension is active.
 // It asks the user if they want to cast the desktop. If they click on the
 // chevron, then a detail view will replace this view where the user will
 // actually pick the cast receiver.
@@ skipping 276 matching lines @@
   void UpdateAlignment(ShelfAlignment alignment);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CastTrayView);
 };
 
 CastTrayView::CastTrayView(SystemTrayItem* tray_item)
     : TrayItemView(tray_item) {
   CreateImageView();
   if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-    image_view()->SetImage(gfx::CreateVectorIcon(
-        gfx::VectorIconId::SYSTEM_TRAY_CAST, kTrayIconColor));
+    image_view()->SetImage(
+        gfx::CreateVectorIcon(kSystemTrayCastIcon, kTrayIconColor));
   } else {
     image_view()->SetImage(ui::ResourceBundle::GetSharedInstance()
                                .GetImageNamed(IDR_AURA_UBER_TRAY_SCREENSHARE)
                                .ToImageSkia());
   }
 }
 
 CastTrayView::~CastTrayView() {}
 
 void CastTrayView::UpdateAlignment(ShelfAlignment alignment) {
@@ skipping 302 matching lines @@
   is_casting_ = started;
   UpdatePrimaryView();
 }
 
 void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
   if (tray_)
     tray_->UpdateAlignment(alignment);
 }
 
 }  // namespace ash