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

Unified Diff: ash/common/system/tray/tray_item_more.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/tray/tray_image_item.cc ('k') | ash/common/system/tray/tray_notification_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/tray_item_more.cc
diff --git a/ash/common/system/tray/tray_item_more.cc b/ash/common/system/tray/tray_item_more.cc
index d9b8244db6f8c4e154b69976ac10f34f6b6a8f58..6d4fe55191bcf428fd06a196cbcf24986915adac 100644
--- a/ash/common/system/tray/tray_item_more.cc
+++ b/ash/common/system/tray/tray_item_more.cc
@@ -8,12 +8,12 @@
#include "ash/common/system/tray/fixed_sized_image_view.h"
#include "ash/common/system/tray/system_tray_item.h"
#include "ash/common/system/tray/tray_constants.h"
+#include "ash/resources/vector_icons/vector_icons.h"
#include "grit/ash_resources.h"
#include "ui/accessibility/ax_view_state.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"
@@ -41,8 +41,8 @@ TrayItemMore::TrayItemMore(SystemTrayItem* owner, bool show_more)
more_ = new views::ImageView;
more_->EnableCanvasFlippingForRTLUI(true);
if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
- more_->SetImage(gfx::CreateVectorIcon(
- gfx::VectorIconId::SYSTEM_MENU_ARROW_RIGHT, kMenuIconColor));
+ more_->SetImage(
+ gfx::CreateVectorIcon(kSystemMenuArrowRightIcon, kMenuIconColor));
} else {
more_->SetImage(ui::ResourceBundle::GetSharedInstance()
.GetImageNamed(IDR_AURA_UBER_TRAY_MORE)
« no previous file with comments | « ash/common/system/tray/tray_image_item.cc ('k') | ash/common/system/tray/tray_notification_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698