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

ash/common/system/chromeos/tray_caps_lock.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/chromeos/tray_caps_lock.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/wm_shell.h"
+#include "ash/resources/vector_icons/vector_icons.h"
 #include "base/sys_info.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.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/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
 bool CapsLockIsEnabled() {
   chromeos::input_method::InputMethodManager* ime =
       chromeos::input_method::InputMethodManager::Get();
   return (ime && ime->GetImeKeyboard())
              ? ime->GetImeKeyboard()->CapsLockIsEnabled()
              : false;
 }
 }
 
 class CapsLockDefaultView : public ActionableView {
  public:
   CapsLockDefaultView()
       : text_label_(new views::Label), shortcut_label_(new views::Label) {
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                           kTrayPopupPaddingHorizontal, 0,
                                           kTrayPopupPaddingBetweenItems));
 
     FixedSizedImageView* image =
         new FixedSizedImageView(0, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
     if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-      image->SetImage(gfx::CreateVectorIcon(
-          gfx::VectorIconId::SYSTEM_MENU_CAPS_LOCK, kMenuIconColor));
+      image->SetImage(
+          gfx::CreateVectorIcon(kSystemMenuCapsLockIcon, kMenuIconColor));
     } else {
       ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
       image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK)
                           .ToImageSkia());
     }
     AddChildView(image);
 
     text_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     AddChildView(text_label_);
 
@@ skipping 128 matching lines @@
   DCHECK(detailed_ == NULL);
   detailed_ = new views::View;
 
   detailed_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, kTrayPopupPaddingHorizontal, 10,
       kTrayPopupPaddingBetweenItems));
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   views::ImageView* image = new views::ImageView;
   if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
-    image->SetImage(CreateVectorIcon(gfx::VectorIconId::SYSTEM_MENU_CAPS_LOCK,
-                                     kMenuIconSize, kMenuIconColor));
+    image->SetImage(CreateVectorIcon(kSystemMenuCapsLockIcon, kMenuIconSize,
+                                     kMenuIconColor));
   } else {
     image->SetImage(
         bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).ToImageSkia());
   }
 
   detailed_->AddChildView(image);
 
   const int string_id =
       WmShell::Get()->system_tray_delegate()->IsSearchKeyMappedToCapsLock()
           ? IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_SEARCH
           : IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_ALT_SEARCH;
   views::Label* label = new views::Label(bundle.GetLocalizedString(string_id));
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   detailed_->AddChildView(label);
   WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_CAPS_LOCK_DETAILED);
 
   return detailed_;
 }
 
 void TrayCapsLock::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayCapsLock::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 }  // namespace ash