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 ab7e994f9ab022d511baf762cf58ae80ce365360..9aa0bb301e3a5f8231974dfea84347ee52d7689e 100644 |
--- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc |
+++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc |
@@ -505,10 +505,12 @@ void DraggedTabController::Observe(int type, |
// DraggedTabController, MessageLoop::Observer implementation: |
#if defined(OS_WIN) |
-void DraggedTabController::WillProcessMessage(const MSG& msg) { |
+base::EventStatus DraggedTabController::WillProcessEvent( |
+ const base::NativeEvent& event) { |
+ return base::EVENT_CONTINUE; |
} |
-void DraggedTabController::DidProcessMessage(const MSG& msg) { |
+void DraggedTabController::DidProcessEvent(const base::NativeEvent& event) { |
// 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 +518,13 @@ void DraggedTabController::DidProcessMessage(const MSG& msg) { |
if (msg.message == WM_KEYDOWN && msg.wParam == VK_ESCAPE) |
msw
2011/09/27 03:51:42
event.message, etc.
oshima
2011/09/27 16:39:39
Done.
|
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& event) { |
+ return base::EVENT_CONTINUE; |
+} |
+void DraggedTabController::DidProcessEvent(const base::NativeEvent& event) { |
sadrul
2011/09/27 04:13:23
+blank line
oshima
2011/09/27 16:39:39
Done.
|
+ NOTIMPLEMENTED(); |
} |
#elif defined(TOOLKIT_USES_GTK) |
void DraggedTabController::WillProcessEvent(GdkEvent* event) { |