diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 16:18:08 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 16:18:08 +0000 |
| commit | 6f34b4836f777a3c325ded3256b313c030fc3568 (patch) | |
| tree | eae5bf57b0b2fe311894d5da221fc254882d57b9 /ash/touch | |
| parent | 4d1e595f9c36f20be4aa2fee6e15a95c650a72a9 (diff) | |
| download | chromium_src-6f34b4836f777a3c325ded3256b313c030fc3568.zip chromium_src-6f34b4836f777a3c325ded3256b313c030fc3568.tar.gz chromium_src-6f34b4836f777a3c325ded3256b313c030fc3568.tar.bz2 | |
events: Update scroll and touch handlers to not return EventResult.
BUG=163618
Review URL: https://codereview.chromium.org/11568006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/touch')
| -rw-r--r-- | ash/touch/touch_observer_hud.cc | 6 | ||||
| -rw-r--r-- | ash/touch/touch_observer_hud.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc index 22dc029..176e52f 100644 --- a/ash/touch/touch_observer_hud.cc +++ b/ash/touch/touch_observer_hud.cc @@ -182,9 +182,9 @@ void TouchObserverHUD::UpdateTouchPointLabel(int index) { touch_labels_[index]->SetText(UTF8ToUTF16(string)); } -ui::EventResult TouchObserverHUD::OnTouchEvent(ui::TouchEvent* event) { +void TouchObserverHUD::OnTouchEvent(ui::TouchEvent* event) { if (event->touch_id() >= kMaxTouchPoints) - return ui::ER_UNHANDLED; + return; if (event->type() != ui::ET_TOUCH_CANCELLED) touch_positions_[event->touch_id()] = event->root_location(); @@ -197,8 +197,6 @@ ui::EventResult TouchObserverHUD::OnTouchEvent(ui::TouchEvent* event) { UpdateTouchPointLabel(event->touch_id()); widget_->SetSize(widget_->GetContentsView()->GetPreferredSize()); - - return ui::ER_UNHANDLED; } void TouchObserverHUD::OnWidgetClosing(views::Widget* widget) { diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h index 03c1bac..acee910 100644 --- a/ash/touch/touch_observer_hud.h +++ b/ash/touch/touch_observer_hud.h @@ -35,7 +35,7 @@ class TouchObserverHUD : public ui::EventHandler, void UpdateTouchPointLabel(int index); // Overriden from ui::EventHandler: - virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE; + virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; // Overridden from views::WidgetObserver: virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; |