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

Unified Diff: chrome/browser/ui/views/tabs/dragged_tab_controller.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: 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: chrome/browser/ui/views/tabs/dragged_tab_controller.cc
diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
index 2b4c9ad5752a50a1bbd5aabe85c35f3bd79d9269..7d0da6f781e30bdf2732f2dcce5e1e019d9e917e 100644
--- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
@@ -505,10 +505,11 @@ void DraggedTabController::Observe(int type,
// DraggedTabController, MessageLoop::Observer implementation:
#if defined(OS_WIN)
-void DraggedTabController::WillProcessMessage(const MSG& msg) {
+base::EventStatus DraggedTabController::WillProcessEvent(const MSG& msg) {
+ return base::EVENT_CONTINUE;
}
-void DraggedTabController::DidProcessMessage(const MSG& msg) {
+void DraggedTabController::DidProcessEvent(const MSG& msg) {
// If the user presses ESC during a drag, we need to abort and revert things
// to the way they were. This is the most reliable way to do this since no
// single view or window reliably receives events throughout all the various
@@ -516,10 +517,13 @@ void DraggedTabController::DidProcessMessage(const MSG& msg) {
if (msg.message == WM_KEYDOWN && msg.wParam == VK_ESCAPE)
EndDrag(true);
}
-#elif defined(TOUCH_UI)
-base::MessagePumpObserver::EventStatus
- DraggedTabController::WillProcessXEvent(XEvent* xevent) {
- return EVENT_CONTINUE;
+#elif defined(TOUCH_UI) || defined(USE_AURA)
+base::EventStatus DraggedTabController::WillProcessEvent(
+ const base::NativeEvent& xevent) {
+ return base::EVENT_CONTINUE;
+}
+void DraggedTabController::DidProcessEvent(const base::NativeEvent& xevent) {
+ NOTIMPLEMENTED();
}
#elif defined(TOOLKIT_USES_GTK)
void DraggedTabController::WillProcessEvent(GdkEvent* event) {

Powered by Google App Engine
This is Rietveld 408576698