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

Unified Diff: ash/common/system/chromeos/palette/tools/laser_pointer_mode.h

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.h
diff --git a/ash/common/system/chromeos/palette/tools/laser_pointer_mode.h b/ash/common/system/chromeos/palette/tools/laser_pointer_mode.h
index b171a1eba6dbdbe41d697072341cf9a3bc8aa092..8b49916ca37d1f0dca87304faf0517339ae2333f 100644
--- a/ash/common/system/chromeos/palette/tools/laser_pointer_mode.h
+++ b/ash/common/system/chromeos/palette/tools/laser_pointer_mode.h
@@ -7,8 +7,13 @@
#include "ash/ash_export.h"
#include "ash/common/system/chromeos/palette/common_palette_tool.h"
+#include "ui/gfx/geometry/point.h"
#include "ui/views/pointer_watcher.h"
+namespace base {
+class Timer;
+}
+
namespace ash {
class LaserPointerView;
@@ -29,11 +34,11 @@ class ASH_EXPORT LaserPointerMode : public CommonPaletteTool,
PaletteToolId GetToolId() const override;
void OnEnable() override;
void OnDisable() override;
- gfx::VectorIconId GetActiveTrayIcon() override;
+ const gfx::VectorIcon& GetActiveTrayIcon() const override;
views::View* CreateView() override;
// CommonPaletteTool:
- gfx::VectorIconId GetPaletteIconId() override;
+ const gfx::VectorIcon& GetPaletteIcon() const override;
// views::PointerWatcher:
void OnPointerEventObserved(const ui::PointerEvent& event,

Powered by Google App Engine
This is Rietveld 408576698