summaryrefslogtreecommitdiffstats
path: root/ui/views/touchui
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-19 04:50:16 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-19 04:50:16 +0000
commit11c36bed534c21bb2c6203c3ad6ca5ea54ebf91d (patch)
tree571a73e5c23ec51cf2f0591867421df97678d69c /ui/views/touchui
parent684899472204f817834c51d581f518571a6b882d (diff)
downloadchromium_src-11c36bed534c21bb2c6203c3ad6ca5ea54ebf91d.zip
chromium_src-11c36bed534c21bb2c6203c3ad6ca5ea54ebf91d.tar.gz
chromium_src-11c36bed534c21bb2c6203c3ad6ca5ea54ebf91d.tar.bz2
Now that we are doing a hard-cut-over to Aura, remove a bunch of *Views based classes that are obsoleted by Aura. Also remove a bunch of Wayland stuff, since any future Wayland integration is likely done as an implementation detail of Aura, not Views.
Specifically: - views-desktop (classes and NativeWidgetView[s]) - NativeWidgetViews subclasses in Chrome (Constrained Windows, NTCVV, NTCCV, BrowserFrameViews et al). - RWHVV, NWKEV - NativeViewHostViews BUG=none TEST=none Review URL: http://codereview.chromium.org/8598024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/touchui')
-rw-r--r--ui/views/touchui/gesture_manager.cc32
1 files changed, 10 insertions, 22 deletions
diff --git a/ui/views/touchui/gesture_manager.cc b/ui/views/touchui/gesture_manager.cc
index 0508592..51b2c79 100644
--- a/ui/views/touchui/gesture_manager.cc
+++ b/ui/views/touchui/gesture_manager.cc
@@ -11,7 +11,6 @@
#include "base/logging.h"
#include "ui/views/events/event.h"
#include "views/view.h"
-#include "views/views_delegate.h"
#include "views/widget/widget.h"
namespace views {
@@ -38,28 +37,17 @@ bool GestureManager::ProcessTouchEventForGesture(const TouchEvent& event,
// location information from the native-event, so it needs to convert the
// coordinate to the target widget.
MouseEvent mouseev(event);
- if (ViewsDelegate::views_delegate->GetDefaultParentView()) {
- // TODO(oshima): We may need to send the event back through
- // window manager to handle mouse capture correctly.
- Widget* desktop =
- ViewsDelegate::views_delegate->GetDefaultParentView()->GetWidget();
- Widget* source_widget = source->GetWidget();
- MouseEvent converted(
- mouseev, desktop->GetRootView(), source_widget->GetRootView());
- source_widget->OnMouseEvent(converted);
+ Widget* source_widget = source->GetWidget();
+ Widget* top_widget = source_widget->GetTopLevelWidget();
+ if (source_widget != top_widget && top_widget) {
+ // This is necessary as TYPE_CHILD widget is still NativeWidgetGtk.
+ // Fix this once TYPE_CHILD is switched to NativeWidgetViews.
+ MouseEvent converted(mouseev,
+ top_widget->GetRootView(),
+ source_widget->GetRootView());
+ source_widget->OnMouseEvent(mouseev);
} else {
- Widget* source_widget = source->GetWidget();
- Widget* top_widget = source_widget->GetTopLevelWidget();
- if (source_widget != top_widget && top_widget) {
- // This is necessary as TYPE_CHILD widget is still NativeWidgetGtk.
- // Fix this once TYPE_CHILD is switched to NativeWidgetViews.
- MouseEvent converted(mouseev,
- top_widget->GetRootView(),
- source_widget->GetRootView());
- source_widget->OnMouseEvent(mouseev);
- } else {
- source_widget->OnMouseEvent(mouseev);
- }
+ source_widget->OnMouseEvent(mouseev);
}
return true;
}