Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: ash/common/system/chromeos/tray_caps_lock.cc

Issue 2316183003: Move a bunch of ash-only vector icons to ash/. (Closed)
Patch Set: drop the "id". Just "icon". It's cleaner. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/common/system/chromeos/tray_caps_lock.cc
diff --git a/ash/common/system/chromeos/tray_caps_lock.cc b/ash/common/system/chromeos/tray_caps_lock.cc
index c95661d3d774b63f6555cb31db91b8b4e6c5a1d0..87e02896f41ada6df549757c0c0f49d53820b76d 100644
--- a/ash/common/system/chromeos/tray_caps_lock.cc
+++ b/ash/common/system/chromeos/tray_caps_lock.cc
@@ -10,6 +10,7 @@
#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"
@@ -19,7 +20,6 @@
#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"
@@ -48,8 +48,8 @@ class CapsLockDefaultView : public ActionableView {
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)
@@ -198,8 +198,8 @@ views::View* TrayCapsLock::CreateDetailedView(LoginStatus status) {
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());
« no previous file with comments | « ash/common/system/chromeos/screen_security/screen_tray_item.cc ('k') | ash/common/system/tray/label_tray_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698