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

Unified Diff: ash/common/system/chromeos/screen_security/screen_tray_item.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
« no previous file with comments | « ash/common/system/chromeos/power/power_status.cc ('k') | ash/common/system/chromeos/tray_caps_lock.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/screen_security/screen_tray_item.cc
diff --git a/ash/common/system/chromeos/screen_security/screen_tray_item.cc b/ash/common/system/chromeos/screen_security/screen_tray_item.cc
index 4e03a029f325e829d53a8549dcb147ca658ccd19..d3613a3185eb522af270bfc64d5269276a710751 100644
--- a/ash/common/system/chromeos/screen_security/screen_tray_item.cc
+++ b/ash/common/system/chromeos/screen_security/screen_tray_item.cc
@@ -8,10 +8,10 @@
#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"
@@ -28,8 +28,8 @@ 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)
@@ -94,8 +94,8 @@ void ScreenStatusView::CreateItems() {
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)
« no previous file with comments | « ash/common/system/chromeos/power/power_status.cc ('k') | ash/common/system/chromeos/tray_caps_lock.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698