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

Unified Diff: ash/common/system/chromeos/palette/tools/capture_region_mode.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/palette/tools/capture_region_mode.cc
diff --git a/ash/common/system/chromeos/palette/tools/capture_region_mode.cc b/ash/common/system/chromeos/palette/tools/capture_region_mode.cc
index 6cac51df83f02f273586852429869b72aab6c64c..27f02951590ad920c723428a5d35074774380653 100644
--- a/ash/common/system/chromeos/palette/tools/capture_region_mode.cc
+++ b/ash/common/system/chromeos/palette/tools/capture_region_mode.cc
@@ -10,6 +10,7 @@
#include "ash/common/system/toast/toast_data.h"
#include "ash/common/system/toast/toast_manager.h"
#include "ash/common/wm_shell.h"
+#include "ash/resources/vector_icons/vector_icons.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -35,9 +36,9 @@ PaletteToolId CaptureRegionMode::GetToolId() const {
return PaletteToolId::CAPTURE_REGION;
}
-gfx::VectorIconId CaptureRegionMode::GetActiveTrayIcon() {
+const gfx::VectorIcon& CaptureRegionMode::GetActiveTrayIcon() const {
// TODO(jdufault): Update to real icon once new tray icons are ready.
- return gfx::VectorIconId::PALETTE_TRAY_ICON_MAGNIFY;
+ return kPaletteTrayIconMagnifyIcon;
}
void CaptureRegionMode::OnEnable() {
@@ -66,8 +67,8 @@ views::View* CaptureRegionMode::CreateView() {
l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_CAPTURE_REGION_ACTION));
}
-gfx::VectorIconId CaptureRegionMode::GetPaletteIconId() {
- return gfx::VectorIconId::PALETTE_ACTION_CAPTURE_REGION;
+const gfx::VectorIcon& CaptureRegionMode::GetPaletteIcon() const {
+ return kPaletteActionCaptureRegionIcon;
}
void CaptureRegionMode::OnScreenshotDone() {

Powered by Google App Engine
This is Rietveld 408576698