Let Chrome app handle Ash accelerators first if the app is launched as a window

ui/views/focus/focus_manager.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/focus/focus_manager.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/views/focus/focus_manager_delegate.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/focus/widget_focus_manager.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
-FocusManager::FocusManager(Widget* widget)
+FocusManager::FocusManager(Widget* widget, FocusManagerDelegate* delegate)
     : widget_(widget),
+      delegate_(delegate),
       focused_view_(NULL),
       accelerator_manager_(new ui::AcceleratorManager),
       focus_change_reason_(kReasonDirectFocusChange),
 #if defined(USE_X11)
       should_handle_menu_key_release_(false),
 #endif
       is_changing_focus_(false) {
   DCHECK(widget_);
   stored_focused_view_storage_id_ =
       ViewStorage::GetInstance()->CreateStorageID();
@@ skipping 12 matching lines @@
   // 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 || event.type() != ui::ET_KEY_RELEASED)
     should_handle_menu_key_release_ = false;
 
   if (event.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) {
+    if ((key_code == ui::VKEY_MENU) &&
+        (event.flags() & ~ui::EF_ALT_DOWN) == 0) {
       should_handle_menu_key_release_ = true;
       return false;
     }
-    // Pass through to the reset of OnKeyEvent.
+    // Pass through to the rest of OnKeyEvent.
   } else if (key_code == ui::VKEY_MENU && should_handle_menu_key_release_ &&
              (event.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);
     return ProcessAccelerator(accelerator);
-  } else {
+  } else if (event.type() != ui::ET_KEY_RELEASED) {
     return false;
   }
 #else
-  if (event.type() != ui::ET_KEY_PRESSED)
+  if (event.type() != ui::ET_KEY_PRESSED && event.type() != ui::ET_KEY_RELEASED)
     return false;
 #endif
 
   ui::Accelerator accelerator(event.key_code(),
                               event.IsShiftDown(),
                               event.IsControlDown(),
                               event.IsAltDown());
+  accelerator.set_type(event.type());
 
+  if (event.type() == ui::ET_KEY_PRESSED) {
 #if defined(OS_WIN)
-  // If the focused view wants to process the key event as is, let it be.
-  // This is not used for linux/aura.
-  if (focused_view_ && focused_view_->SkipDefaultKeyEventProcessing(event) &&
-      !accelerator_manager_->HasPriorityHandler(accelerator))
-    return true;
+    // If the focused view wants to process the key event as is, let it be.
+    // This is not used for linux/aura.
+    if (focused_view_ && focused_view_->SkipDefaultKeyEventProcessing(event) &&
+        !accelerator_manager_->HasPriorityHandler(accelerator))
+      return true;
 #endif
 
-  // Intercept Tab related messages for focus traversal.
-  // Note that we don't do focus traversal if the root window is not part of the
-  // active window hierarchy as this would mean we have no focused view and
-  // would focus the first focusable view.
+    // Intercept Tab related messages for focus traversal.
+    // Note that we don't do focus traversal if the root window is not part of
+    // the active window hierarchy as this would mean we have no focused view
+    // and would focus the first focusable view.
 #if defined(OS_WIN) && !defined(USE_AURA)
-  HWND top_window = widget_->GetNativeView();
-  HWND active_window = ::GetActiveWindow();
-  if ((active_window == top_window || ::IsChild(active_window, top_window)) &&
-       IsTabTraversalKeyEvent(event)) {
-    AdvanceFocus(event.IsShiftDown());
-    return false;
-  }
+    HWND top_window = widget_->GetNativeView();
+    HWND active_window = ::GetActiveWindow();
+    if ((active_window == top_window || ::IsChild(active_window, top_window)) &&
+        IsTabTraversalKeyEvent(event)) {
+      AdvanceFocus(event.IsShiftDown());
+      return false;
+    }
 #else
-  if (IsTabTraversalKeyEvent(event)) {
-    AdvanceFocus(event.IsShiftDown());
-    return false;
-  }
+    if (IsTabTraversalKeyEvent(event)) {
+      AdvanceFocus(event.IsShiftDown());
+      return false;
+    }
 #endif
 
-  // Intercept arrow key messages to switch between grouped views.
-  if (focused_view_ && focused_view_->GetGroup() != -1 &&
-      (key_code == ui::VKEY_UP || key_code == ui::VKEY_DOWN ||
-       key_code == ui::VKEY_LEFT || key_code == ui::VKEY_RIGHT)) {
-    bool next = (key_code == ui::VKEY_RIGHT || key_code == ui::VKEY_DOWN);
-    View::Views views;
-    focused_view_->parent()->GetViewsInGroup(focused_view_->GetGroup(), &views);
-    View::Views::const_iterator i(
-        std::find(views.begin(), views.end(), focused_view_));
-    DCHECK(i != views.end());
-    int index = static_cast<int>(i - views.begin());
-    index += next ? 1 : -1;
-    if (index < 0) {
-      index = static_cast<int>(views.size()) - 1;
-    } else if (index >= static_cast<int>(views.size())) {
-      index = 0;
+    // Intercept arrow key messages to switch between grouped views.
+    if (focused_view_ && focused_view_->GetGroup() != -1 &&
+        (key_code == ui::VKEY_UP || key_code == ui::VKEY_DOWN ||
+         key_code == ui::VKEY_LEFT || key_code == ui::VKEY_RIGHT)) {
+      bool next = (key_code == ui::VKEY_RIGHT || key_code == ui::VKEY_DOWN);
+      View::Views views;
+      focused_view_->parent()->GetViewsInGroup(focused_view_->GetGroup(),
+                                               &views);
+      View::Views::const_iterator i(
+          std::find(views.begin(), views.end(), focused_view_));
+      DCHECK(i != views.end());
+      int index = static_cast<int>(i - views.begin());
+      index += next ? 1 : -1;
+      if (index < 0) {
+        index = static_cast<int>(views.size()) - 1;
+      } else if (index >= static_cast<int>(views.size())) {
+        index = 0;
+      }
+      SetFocusedViewWithReason(views[index], kReasonFocusTraversal);
+      return false;
     }
-    SetFocusedViewWithReason(views[index], kReasonFocusTraversal);
-    return false;
   }
 
   // Process keyboard accelerators.
   // If the key combination matches an accelerator, the accelerator is
   // triggered, otherwise the key event is processed as usual.
   if (ProcessAccelerator(accelerator)) {
     // If a shortcut was activated for this keydown message, do not propagate
     // the event further.
     return false;
   }
@@ skipping 276 matching lines @@
 void FocusManager::UnregisterAccelerator(const ui::Accelerator& accelerator,
                                          ui::AcceleratorTarget* target) {
   accelerator_manager_->Unregister(accelerator, target);
 }
 
 void FocusManager::UnregisterAccelerators(ui::AcceleratorTarget* target) {
   accelerator_manager_->UnregisterAll(target);
 }
 
 bool FocusManager::ProcessAccelerator(const ui::Accelerator& accelerator) {
-  return accelerator_manager_->Process(accelerator);
+  if (accelerator_manager_->Process(accelerator))
+    return true;
+  if (delegate_.get())
+    return delegate_->ProcessAccelerator(accelerator);
+  return false;
 }
 
 void FocusManager::MaybeResetMenuKeyState(const KeyEvent& key) {
 #if defined(USE_X11)
   // 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 unhandled VKEY_MENU key press event. See also HandleKeyboardEvent().
   if (key.key_code() != ui::VKEY_MENU || key.type() != ui::ET_KEY_RELEASED)
     should_handle_menu_key_release_ = false;
 #endif
 }
 
 ui::AcceleratorTarget* FocusManager::GetCurrentTargetForAccelerator(
     const ui::Accelerator& accelerator) const {
-  return accelerator_manager_->GetCurrentTarget(accelerator);
+  ui::AcceleratorTarget* target =
+      accelerator_manager_->GetCurrentTarget(accelerator);
+  if (!target && delegate_.get())
+    target = delegate_->GetCurrentTargetForAccelerator(accelerator);
+  return target;
 }
 
 bool FocusManager::HasPriorityHandler(
     const ui::Accelerator& accelerator) const {
   return accelerator_manager_->HasPriorityHandler(accelerator);
 }
 
 // static
 bool FocusManager::IsTabTraversalKeyEvent(const KeyEvent& key_event) {
   return key_event.key_code() == ui::VKEY_TAB && !key_event.IsControlDown();
@@ skipping 10 matching lines @@
 
 void FocusManager::AddFocusChangeListener(FocusChangeListener* listener) {
   focus_change_listeners_.AddObserver(listener);
 }
 
 void FocusManager::RemoveFocusChangeListener(FocusChangeListener* listener) {
   focus_change_listeners_.RemoveObserver(listener);
 }
 
 }  // namespace views