Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: views/widget/native_widget_gtk.cc

Issue 8021009: Consolidate message observer API for win and aura (and touch). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed msw's comments Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: views/widget/native_widget_gtk.cc
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc
index 21eda2707acb2183f51549422ab0f4f09c002af6..4939ca60a7a6ada2c69d5e3c4e2d1f6169252cf7 100644
--- a/views/widget/native_widget_gtk.cc
+++ b/views/widget/native_widget_gtk.cc
@@ -260,7 +260,15 @@ class NativeWidgetGtk::DropObserver : public MessageLoopForUI::Observer {
static DropObserver* GetInstance() {
return Singleton<DropObserver>::get();
}
+#if defined(TOUCH_UI)
+ virtual base::EventStatus WillProcessEvent(
+ const base::NativeEvent& event) OVERRIDE {
+ return base::EVENT_CONTINUE;
+ }
+ virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
+ }
+#else
virtual void WillProcessEvent(GdkEvent* event) {
if (event->type == GDK_DROP_START) {
NativeWidgetGtk* widget = GetNativeWidgetGtkForEvent(event);
@@ -271,6 +279,7 @@ class NativeWidgetGtk::DropObserver : public MessageLoopForUI::Observer {
virtual void DidProcessEvent(GdkEvent* event) {
}
+#endif
private:
NativeWidgetGtk* GetNativeWidgetGtkForEvent(GdkEvent* event) {

Powered by Google App Engine
This is Rietveld 408576698