Consolidate message observer API for win and aura (and touch).

chrome/browser/ui/views/tabs/dragged_tab_controller.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/tabs/dragged_tab_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 487 matching lines @@
     }
   }
   // If we get here it means we got notification for a tab we don't know about.
   NOTREACHED();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // 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
   // kinds of tab dragging.
   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) {
 }
 
 void DraggedTabController::DidProcessEvent(GdkEvent* event) {
   if (event->type == GDK_KEY_PRESS &&
       reinterpret_cast<GdkEventKey*>(event)->keyval == GDK_Escape) {
     EndDrag(true);
   }
@@ skipping 902 matching lines @@
 
 bool DraggedTabController::AreTabsConsecutive() {
   for (size_t i = 1; i < drag_data_.size(); ++i) {
     if (drag_data_[i - 1].source_model_index + 1 !=
         drag_data_[i].source_model_index) {
       return false;
     }
   }
   return true;
 }