diff options
| author | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 03:48:35 +0000 |
|---|---|---|
| committer | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 03:48:35 +0000 |
| commit | 82480d15af315d31401271617b2764617607ca24 (patch) | |
| tree | 279eba0ba7212b82c08070a35ead3b77cf42130a /ui/views/widget/widget.cc | |
| parent | a7826751a6148308e774797db2f9842ec1cdefa1 (diff) | |
| download | chromium_src-82480d15af315d31401271617b2764617607ca24.zip chromium_src-82480d15af315d31401271617b2764617607ca24.tar.gz chromium_src-82480d15af315d31401271617b2764617607ca24.tar.bz2 | |
Revert 117869 - Initial views touchui Gesture Recognizer support
This is just a merge of Gajen's patch (http://codereview.chromium.org/8364039/) with ToT.
BUG=101645
TEST=views_unittest
Review URL: http://codereview.chromium.org/9076002
TBR=vollick@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9231013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget/widget.cc')
| -rw-r--r-- | ui/views/widget/widget.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index b9be13b4..73c2bd0 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -1074,12 +1074,7 @@ void Widget::OnMouseCaptureLost() { ui::TouchStatus Widget::OnTouchEvent(const TouchEvent& event) { ScopedEvent scoped(this, event); - return GetRootView()->OnTouchEvent(event); -} - -ui::GestureStatus Widget::OnGestureEvent(const GestureEvent& event) { - ScopedEvent scoped(this, event); - return GetRootView()->OnGestureEvent(event); + return static_cast<internal::RootView*>(GetRootView())->OnTouchEvent(event); } bool Widget::ExecuteCommand(int command_id) { |