| Index: ui/views/controls/touch/touch_hud_drawer.h
|
| diff --git a/ui/views/animation/ink_drop_stub.h b/ui/views/controls/touch/touch_hud_drawer.h
|
| similarity index 30%
|
| copy from ui/views/animation/ink_drop_stub.h
|
| copy to ui/views/controls/touch/touch_hud_drawer.h
|
| index 00fb4900e4f11385ddaff5f93ec27befcca994bb..43472ea69e9f9d1362ad55ac74bcfa93d637ca8e 100644
|
| --- a/ui/views/animation/ink_drop_stub.h
|
| +++ b/ui/views/controls/touch/touch_hud_drawer.h
|
| @@ -2,28 +2,44 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#ifndef UI_VIEWS_CONTROLS_TOUCH_TOUCH_HUD_DRAWER_H_
|
| +#define UI_VIEWS_CONTROLS_TOUCH_TOUCH_HUD_DRAWER_H_
|
| +
|
| +#include <map>
|
| +
|
| #include "base/macros.h"
|
| -#include "ui/views/animation/ink_drop.h"
|
| #include "ui/views/views_export.h"
|
|
|
| +namespace ash {
|
| +class TouchHudProjectionTest;
|
| +}
|
| +
|
| +namespace ui {
|
| +class LocatedEvent;
|
| +}
|
| +
|
| namespace views {
|
| +class TouchPointView;
|
| +class Widget;
|
|
|
| -// A stub implementation of an InkDrop that can be used when no visuals should
|
| -// be shown. e.g. material design is enabled.
|
| -class VIEWS_EXPORT InkDropStub : public InkDrop {
|
| +class VIEWS_EXPORT TouchHudDrawer {
|
| public:
|
| - InkDropStub();
|
| - ~InkDropStub() override;
|
| + TouchHudDrawer();
|
| + ~TouchHudDrawer();
|
|
|
| - // InkDrop:
|
| - InkDropState GetTargetInkDropState() const override;
|
| - void AnimateToState(InkDropState state) override;
|
| - void SnapToActivated() override;
|
| - void SetHovered(bool is_hovered) override;
|
| - void SetFocused(bool is_hovered) override;
|
| + // Called to clear touch points and traces from the screen.
|
| + void Clear();
|
| +
|
| + void HandleTouchEvent(const ui::LocatedEvent* event, Widget* parent_widget);
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(InkDropStub);
|
| + friend class ash::TouchHudProjectionTest;
|
| +
|
| + std::map<int, TouchPointView*> points_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(TouchHudDrawer);
|
| };
|
|
|
| } // namespace views
|
| +
|
| +#endif // UI_VIEWS_CONTROLS_TOUCH_TOUCH_HUD_DRAWER_H_
|
|
|