AURA/X11: Handle VKEY_MENU accelerator on content area

chrome/browser/ui/views/unhandled_keyboard_event_handler.cc

Index: chrome/browser/ui/views/unhandled_keyboard_event_handler.cc
diff --git a/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc b/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc
index fdf17e3295e139629a86cbd5cb2fdc617aeff594..c8f4514a7ff8818630fe041585eee4789c1a4af7 100644
--- a/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc
+++ b/chrome/browser/ui/views/unhandled_keyboard_event_handler.cc
@@ -4,63 +4,5 @@
 
 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
 
-#include "base/logging.h"
-#include "ui/views/focus/focus_manager.h"
-
-UnhandledKeyboardEventHandler::UnhandledKeyboardEventHandler() {
-  ignore_next_char_event_ = false;
-}
-
 UnhandledKeyboardEventHandler::~UnhandledKeyboardEventHandler() {
 }
-
-void UnhandledKeyboardEventHandler::HandleKeyboardEvent(
-    const NativeWebKeyboardEvent& event,
-    views::FocusManager* focus_manager) {
-  if (!focus_manager) {
-    NOTREACHED();
-    return;
-  }
-  // Previous calls to TranslateMessage can generate Char events as well as
-  // RawKeyDown events, even if the latter triggered an accelerator.  In these
-  // cases, we discard the Char events.
-  if (event.type == WebKit::WebInputEvent::Char && ignore_next_char_event_) {
-    ignore_next_char_event_ = false;
-    return;
-  }
-  // It's necessary to reset this flag, because a RawKeyDown event may not
-  // always generate a Char event.
-  ignore_next_char_event_ = false;
-
-  if (event.type == WebKit::WebInputEvent::RawKeyDown) {
-    ui::Accelerator accelerator(
-        static_cast<ui::KeyboardCode>(event.windowsKeyCode),
-        (event.modifiers & NativeWebKeyboardEvent::ShiftKey) ==
-            NativeWebKeyboardEvent::ShiftKey,
-        (event.modifiers & NativeWebKeyboardEvent::ControlKey) ==
-            NativeWebKeyboardEvent::ControlKey,
-        (event.modifiers & NativeWebKeyboardEvent::AltKey) ==
-            NativeWebKeyboardEvent::AltKey);
-
-    // This is tricky: we want to set ignore_next_char_event_ if
-    // ProcessAccelerator returns true. But ProcessAccelerator might delete
-    // |this| if the accelerator is a "close tab" one. So we speculatively
-    // set the flag and fix it if no event was handled.
-    ignore_next_char_event_ = true;
-
-    if (focus_manager->ProcessAccelerator(accelerator)) {
-      return;
-    }
-
-    // ProcessAccelerator didn't handle the accelerator, so we know both
-    // that |this| is still valid, and that we didn't want to set the flag.
-    ignore_next_char_event_ = false;
-  }
-
-#if defined(OS_WIN) && !defined(USE_AURA)
-  // Any unhandled keyboard/character messages should be defproced.
-  // This allows stuff like F10, etc to work correctly.
-  DefWindowProc(event.os_event.hwnd, event.os_event.message,
-                event.os_event.wParam, event.os_event.lParam);
-#endif
-}