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

Unified Diff: ash/common/system/chromeos/palette/tools/magnifier_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/magnifier_mode.cc
diff --git a/ash/common/system/chromeos/palette/tools/magnifier_mode.cc b/ash/common/system/chromeos/palette/tools/magnifier_mode.cc
index 9bffa4b2b353446c591dc788f1c8f4b686b9a5c5..b7cf5f04b2ff7540bac34c5b855fbbea4500da8c 100644
--- a/ash/common/system/chromeos/palette/tools/magnifier_mode.cc
+++ b/ash/common/system/chromeos/palette/tools/magnifier_mode.cc
@@ -7,6 +7,7 @@
#include "ash/common/palette_delegate.h"
#include "ash/common/system/chromeos/palette/palette_ids.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"
@@ -25,8 +26,8 @@ PaletteToolId MagnifierMode::GetToolId() const {
return PaletteToolId::MAGNIFY;
}
-gfx::VectorIconId MagnifierMode::GetActiveTrayIcon() {
- return gfx::VectorIconId::PALETTE_TRAY_ICON_MAGNIFY;
+const gfx::VectorIcon& MagnifierMode::GetActiveTrayIcon() const {
+ return kPaletteTrayIconMagnifyIcon;
}
void MagnifierMode::OnEnable() {
@@ -44,8 +45,8 @@ views::View* MagnifierMode::CreateView() {
l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_MAGNIFIER_MODE));
}
-gfx::VectorIconId MagnifierMode::GetPaletteIconId() {
- return gfx::VectorIconId::PALETTE_MODE_MAGNIFY;
+const gfx::VectorIcon& MagnifierMode::GetPaletteIcon() const {
+ return kPaletteModeMagnifyIcon;
}
} // namespace ash
« no previous file with comments | « ash/common/system/chromeos/palette/tools/magnifier_mode.h ('k') | ash/common/system/chromeos/power/power_status.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698