Chromium Code Reviews| 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 8b49916ca37d1f0dca87304faf0517339ae2333f..05329e2fac75b35dd0228bb831bc631fe5f4b77e 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,6 @@ |
| #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; |
| @@ -16,19 +14,13 @@ class Timer; |
| 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. |
|
jdufault
2016/09/16 18:43:53
This comment is a bit confusing because there is a
sammiequon
2016/09/16 19:21:03
Done.
|
| +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; |
| @@ -40,25 +32,6 @@ class ASH_EXPORT LaserPointerMode : public CommonPaletteTool, |
| // CommonPaletteTool: |
| const gfx::VectorIcon& GetPaletteIcon() const 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); |
| }; |