aura: Make tab-dragging Escape code be cross-platform.

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 13 matching lines @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/user_metrics.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
+#include "ui/base/events.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/screen.h"
 #include "views/events/event.h"
 #include "views/widget/widget.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gdk/gdk.h>  // NOLINT
 #include <gdk/gdkkeysyms.h>  // NOLINT
 #endif
@@ skipping 450 matching lines @@
       return;
     }
   }
   // 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)
+#if defined(OS_WIN) || 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) {
   // 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 (event.message == WM_KEYDOWN && event.wParam == VK_ESCAPE)
+  if (ui::EventTypeFromNative(event) == ui::ET_KEY_PRESSED &&
+      ui::KeyboardCodeFromNative(event) == ui::VKEY_ESCAPE) {
     EndDrag(true);
-}
-#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) {
-  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 842 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;
 }