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..17e5af15b3d6baffc9c45fc8d7f4ccf21eb465d6 100644 |
--- a/ash/common/system/chromeos/palette/tools/laser_pointer_mode.h |
+++ b/ash/common/system/chromeos/palette/tools/laser_pointer_mode.h |
@@ -7,23 +7,16 @@ |
#include "ash/ash_export.h" |
#include "ash/common/system/chromeos/palette/common_palette_tool.h" |
-#include "ui/views/pointer_watcher.h" |
namespace ash { |
-class LaserPointerView; |
- |
-// Controller for the laser pointer functionality. Enables/disables laser |
-// pointer as well as receives points and passes them off to be rendered. |
-class ASH_EXPORT LaserPointerMode : public CommonPaletteTool, |
- public views::PointerWatcher { |
+// Controller for the laser pointer functionality. |
+class ASH_EXPORT LaserPointerMode : public CommonPaletteTool { |
public: |
explicit LaserPointerMode(Delegate* delegate); |
~LaserPointerMode() override; |
private: |
- friend class LaserPointerModeTestApi; |
- |
// PaletteTool: |
PaletteGroup GetGroup() const override; |
PaletteToolId GetToolId() const override; |
@@ -35,25 +28,6 @@ class ASH_EXPORT LaserPointerMode : public CommonPaletteTool, |
// CommonPaletteTool: |
gfx::VectorIconId GetPaletteIconId() override; |
- // views::PointerWatcher: |
- void OnPointerEventObserved(const ui::PointerEvent& event, |
- const gfx::Point& location_in_screen, |
- views::Widget* target) override; |
- |
- void StopTimer(); |
- |
- // Timer callback which adds a point where the mouse was last seen. This |
- // allows the trail to fade away when the mouse is stationary. |
- void AddStationaryPoint(); |
- |
- // Timer which will add a new stationary point when the mouse stops moving. |
- // This will remove points that are too old. |
- std::unique_ptr<base::Timer> timer_; |
- int timer_repeat_count_ = 0; |
- |
- gfx::Point current_mouse_location_; |
- std::unique_ptr<LaserPointerView> laser_pointer_view_; |
- |
DISALLOW_COPY_AND_ASSIGN(LaserPointerMode); |
}; |