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

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

Issue 2239743004: Palette tool laser prototype. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@patch
Patch Set: Fixed patch set 4 errors. Created 4 years, 4 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 f133468d9d394e06049ddaee0da05d883ec208c8..29f1a5a1ce0720bc98c6706a2ad839d5372b582d 100644
--- a/ash/common/system/chromeos/palette/palette_tool.cc
+++ b/ash/common/system/chromeos/palette/palette_tool.cc
@@ -5,12 +5,15 @@
#include "ash/common/system/chromeos/palette/palette_tool.h"
#include "ash/common/system/chromeos/palette/palette_tool_manager.h"
+#include "ash/common/system/chromeos/palette/tools/laser_pointer_mode.h"
#include "ui/gfx/vector_icons_public.h"
namespace ash {
// static
-void PaletteTool::RegisterToolInstances(PaletteToolManager* tool_manager) {}
+void PaletteTool::RegisterToolInstances(PaletteToolManager* tool_manager) {
+ tool_manager->AddTool(base::MakeUnique<LaserPointerMode>(tool_manager));
+}
PaletteTool::PaletteTool(Delegate* delegate) : delegate_(delegate) {}
@@ -25,6 +28,7 @@ void PaletteTool::OnDisable() {
}
gfx::VectorIconId PaletteTool::GetActiveTrayIcon() {
+ // TODO(jdufault): Icons do not seem to support multiple colors.
jdufault 2016/08/19 01:02:08 Remove TODO once you upload the icon fix.
sammiequon 2016/08/19 20:28:46 Ok.
return gfx::VectorIconId::VECTOR_ICON_NONE;
}

Powered by Google App Engine
This is Rietveld 408576698