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

ash/common/system/tray/tray_image_item.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_image_item.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_utils.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.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace ash {
 
 namespace {
 
-// Maps a non-MD PNG resource id to its corresponding MD vector icon id.
+// Maps a non-MD PNG resource id to its corresponding MD vector icon.
 // 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:
-      return gfx::VectorIconId::SYSTEM_TRAY_ACCESSIBILITY;
+      return kSystemTrayAccessibilityIcon;
     case IDR_AURA_UBER_TRAY_UPDATE:
-      return gfx::VectorIconId::SYSTEM_TRAY_UPDATE;
+      return kSystemTrayUpdateIcon;
     case IDR_AURA_UBER_TRAY_VOLUME_MUTE:
-      return gfx::VectorIconId::SYSTEM_TRAY_VOLUME_MUTE;
+      return kSystemTrayVolumeMuteIcon;
 #if defined(OS_CHROMEOS)
     case IDR_AURA_UBER_TRAY_AUTO_ROTATION_LOCKED:
-      return gfx::VectorIconId::SYSTEM_TRAY_ROTATION_LOCK_LOCKED;
+      return kSystemTrayRotationLockLockedIcon;
     case IDR_AURA_UBER_TRAY_CAPS_LOCK:
-      return gfx::VectorIconId::SYSTEM_TRAY_CAPS_LOCK;
+      return kSystemTrayCapsLockIcon;
     case IDR_AURA_UBER_TRAY_TRACING:
       // TODO(tdanderson): Update the icon used for tracing or remove it from
       // the system tray. See crbug.com/625691.
-      return gfx::VectorIconId::CODE;
+      return kSystemMenuTimerIcon;
 #endif
     default:
       NOTREACHED();
       break;
   }
 
-  return vector_id;
+  return gfx::kNoneIcon;
 }
 
 }  // namespace
 
 TrayImageItem::TrayImageItem(SystemTray* system_tray,
                              int resource_id,
                              UmaType uma_type)
     : SystemTrayItem(system_tray, uma_type),
       resource_id_(resource_id),
       icon_color_(kTrayIconColor),
@@ skipping 56 matching lines @@
   tray_view_->SetLayoutManager(new views::BoxLayout(layout, 0, 0, 0));
   tray_view_->Layout();
 }
 
 void TrayImageItem::UpdateImageOnImageView() {
   if (!tray_view_)
     return;
 
   if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
     tray_view_->image_view()->SetImage(gfx::CreateVectorIcon(
-        ResourceIdToVectorIconId(resource_id_), kTrayIconSize, icon_color_));
+        ResourceIdToVectorIcon(resource_id_), kTrayIconSize, icon_color_));
   } else {
     tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance()
                                            .GetImageNamed(resource_id_)
                                            .ToImageSkia());
   }
 }
 
 }  // namespace ash