| Index: ui/aura/gestures/gesture_recognizer_unittest.cc
|
| diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc
|
| index 7f86bfe7e98ea4d3cd82e1f17bbbb87a4922b004..d10e47e48ce603eea3e5f4b78e3ca39329af8d6d 100644
|
| --- a/ui/aura/gestures/gesture_recognizer_unittest.cc
|
| +++ b/ui/aura/gestures/gesture_recognizer_unittest.cc
|
| @@ -335,22 +335,11 @@ class GestureEventConsumeDelegate : public TestWindowDelegate {
|
| class QueueTouchEventDelegate : public GestureEventConsumeDelegate {
|
| public:
|
| explicit QueueTouchEventDelegate(WindowEventDispatcher* dispatcher)
|
| - : window_(NULL),
|
| - dispatcher_(dispatcher),
|
| - queue_events_(true) {
|
| - }
|
| - virtual ~QueueTouchEventDelegate() {
|
| - while(!queue_.empty()) {
|
| - delete queue_.front();
|
| - queue_.pop();
|
| - }
|
| - }
|
| + : window_(NULL), dispatcher_(dispatcher) {}
|
| + virtual ~QueueTouchEventDelegate() {}
|
|
|
| virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
|
| - if (queue_events_) {
|
| - queue_.push(new ui::TouchEvent(*event, window_, window_));
|
| - event->StopPropagation();
|
| - }
|
| + event->StopPropagation();
|
| }
|
|
|
| void ReceivedAck() {
|
| @@ -362,20 +351,15 @@ class QueueTouchEventDelegate : public GestureEventConsumeDelegate {
|
| }
|
|
|
| void set_window(Window* w) { window_ = w; }
|
| - void set_queue_events(bool queue) { queue_events_ = queue; }
|
|
|
| private:
|
| void ReceivedAckImpl(bool prevent_defaulted) {
|
| - scoped_ptr<ui::TouchEvent> event(queue_.front());
|
| - dispatcher_->ProcessedTouchEvent(event.get(), window_,
|
| - prevent_defaulted ? ui::ER_HANDLED : ui::ER_UNHANDLED);
|
| - queue_.pop();
|
| + dispatcher_->ProcessedTouchEvent(
|
| + window_, prevent_defaulted ? ui::ER_HANDLED : ui::ER_UNHANDLED);
|
| }
|
|
|
| - std::queue<ui::TouchEvent*> queue_;
|
| Window* window_;
|
| WindowEventDispatcher* dispatcher_;
|
| - bool queue_events_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(QueueTouchEventDelegate);
|
| };
|
|
|