AURA/X11: Handle VKEY_MENU accelerator on content area

ui/views/widget/native_widget_aura.cc

 // Copyright (c) 2012 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 "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 111 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, public:
 
 NativeWidgetAura::NativeWidgetAura(internal::NativeWidgetDelegate* delegate)
     : delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
       can_activate_(true),
-#if defined(USE_X11)
-      should_handle_menu_key_release_(false),
-#endif
       cursor_(gfx::kNullCursor),
       saved_window_state_(ui::SHOW_STATE_DEFAULT) {
 }
 
 NativeWidgetAura::~NativeWidgetAura() {
   if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
     delete delegate_;
   else
     CloseNow();
 }
@@ skipping 437 matching lines @@
 }
 
 void NativeWidgetAura::SetVisibilityChangedAnimationsEnabled(bool value) {
   // Nothing needed on aura.
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, views::InputMethodDelegate implementation:
 
 void NativeWidgetAura::DispatchKeyEventPostIME(const KeyEvent& key) {
-  if (delegate_->OnKeyEvent(key) || !GetWidget()->GetFocusManager())
+  FocusManager* focus_manager = GetWidget()->GetFocusManager();
+  if (focus_manager)
+    focus_manager->MaybeResetMenuKeyState(key);
+  if (delegate_->OnKeyEvent(key) || !focus_manager)
     return;
-
-#if defined(USE_X11)
-  // TODO(oshima): This is copied from native_widget_gtk for now.
-  // RenderWidgetHostViewAura doesn't work and needs more work.
-  // oshima thinks this should be moved to focus manager (see
-  // crbug.com/106998), but beng believes that this should be done
-  // in RootWindowHosLinux for aura/linux.
-  const int key_code = key.key_code();
-
-  // Always reset |should_handle_menu_key_release_| unless we are handling a
-  // VKEY_MENU key release event. It ensures that VKEY_MENU accelerator can only
-  // be activated when handling a VKEY_MENU key release event which is preceded
-  // by an un-handled VKEY_MENU key press event.
-  if (key_code != ui::VKEY_MENU || key.type() != ui::ET_KEY_RELEASED)
-    should_handle_menu_key_release_ = false;
-
-  if (key.type() == ui::ET_KEY_PRESSED) {
-    // VKEY_MENU is triggered by key release event.
-    // FocusManager::OnKeyEvent() returns false when the key has been consumed.
-    if (key_code != ui::VKEY_MENU)
-      GetWidget()->GetFocusManager()->OnKeyEvent(key);
-    else
-      should_handle_menu_key_release_ = true;
-  } else if (key_code == ui::VKEY_MENU && should_handle_menu_key_release_ &&
-             (key.flags() & ~ui::EF_ALT_DOWN) == 0) {
-    // Trigger VKEY_MENU when only this key is pressed and released, and both
-    // press and release events are not handled by others.
-    ui::Accelerator accelerator(ui::VKEY_MENU, false, false, false);
-    GetWidget()->GetFocusManager()->ProcessAccelerator(accelerator);
-  }
-#else
-  if (key.type() == ui::ET_KEY_PRESSED)
-    GetWidget()->GetFocusManager()->OnKeyEvent(key);
-#endif
+  focus_manager->OnKeyEvent(key);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, aura::WindowDelegate implementation:
 
 gfx::Size NativeWidgetAura::GetMinimumSize() const {
   return delegate_->GetMinimumSize();
 }
 
 void NativeWidgetAura::OnBoundsChanged(const gfx::Rect& old_bounds,
                                        const gfx::Rect& new_bounds) {
   if (old_bounds.origin() != new_bounds.origin())
     GetWidget()->widget_delegate()->OnWidgetMove();
   if (old_bounds.size() != new_bounds.size())
     delegate_->OnNativeWidgetSizeChanged(new_bounds.size());
 }
 
 void NativeWidgetAura::OnFocus() {
-#if defined(USE_X11)
-  should_handle_menu_key_release_ = false;
-#endif
   Widget* widget = GetWidget();
   if (widget->is_top_level()) {
     InputMethod* input_method = widget->GetInputMethod();
     input_method->OnFocus();
   }
   delegate_->OnNativeFocus(window_);
 }
 
 void NativeWidgetAura::OnBlur() {
   Widget* widget = GetWidget();
@@ skipping 234 matching lines @@
   }
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::RootWindow::GetInstance()->IsMouseButtonDown();
 }
 
 }  // namespace internal
 }  // namespace views