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

Unified Diff: ash/common/system/chromeos/palette/palette_tool.cc

Issue 2316183003: Move a bunch of ash-only vector icons to ash/. (Closed)
Patch Set: 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/palette_tool.cc
diff --git a/ash/common/system/chromeos/palette/palette_tool.cc b/ash/common/system/chromeos/palette/palette_tool.cc
index d4ae846e719b9dfca91dd39898e25fc38bcb4627..4d3d408b76ea9803a2aa3d8867756f7c821d89dd 100644
--- a/ash/common/system/chromeos/palette/palette_tool.cc
+++ b/ash/common/system/chromeos/palette/palette_tool.cc
@@ -12,7 +12,7 @@
#include "ash/common/system/chromeos/palette/tools/laser_pointer_mode.h"
#include "ash/common/system/chromeos/palette/tools/magnifier_mode.h"
#include "base/memory/ptr_util.h"
-#include "ui/gfx/vector_icons_public.h"
+#include "ui/gfx/paint_vector_icon.h"
namespace ash {
@@ -38,8 +38,8 @@ void PaletteTool::OnDisable() {
enabled_ = false;
}
-gfx::VectorIconId PaletteTool::GetActiveTrayIcon() {
- return gfx::VectorIconId::VECTOR_ICON_NONE;
+const gfx::VectorIcon& PaletteTool::GetActiveTrayIcon() const {
+ return gfx::kNoneIcon;
}
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698