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

Unified Diff: ash/common/system/chromeos/palette/tools/laser_pointer_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/laser_pointer_mode.cc
diff --git a/ash/common/system/chromeos/palette/tools/laser_pointer_mode.cc b/ash/common/system/chromeos/palette/tools/laser_pointer_mode.cc
index a6594061e888e63a8d049beae3fccd54e368c31d..6c4226c8bd3666f3255d3ebf93478343658c317c 100644
--- a/ash/common/system/chromeos/palette/tools/laser_pointer_mode.cc
+++ b/ash/common/system/chromeos/palette/tools/laser_pointer_mode.cc
@@ -8,6 +8,7 @@
#include "ash/common/system/chromeos/palette/palette_ids.h"
#include "ash/common/system/chromeos/palette/tools/laser_pointer_view.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"
#include "ui/wm/core/coordinate_conversion.h"
@@ -67,12 +68,12 @@ void LaserPointerMode::OnDisable() {
laser_pointer_view_->Stop();
}
-gfx::VectorIconId LaserPointerMode::GetActiveTrayIcon() {
- return gfx::VectorIconId::PALETTE_TRAY_ICON_LASER_POINTER;
+const gfx::VectorIcon& LaserPointerMode::GetActiveTrayIcon() const {
+ return kPaletteTrayIconLaserPointerIcon;
}
-gfx::VectorIconId LaserPointerMode::GetPaletteIconId() {
- return gfx::VectorIconId::PALETTE_MODE_LASER_POINTER;
+const gfx::VectorIcon& LaserPointerMode::GetPaletteIcon() const {
+ return kPaletteModeLaserPointerIcon;
}
views::View* LaserPointerMode::CreateView() {

Powered by Google App Engine
This is Rietveld 408576698