Don't disable Caps Lock when Shift+<non-modifier-key> is pressed and Shift is released first.

ash/accelerators/accelerator_controller.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 "ash/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 
@@ skipping 432 matching lines @@
 
   // Ignore accelerators invoked as repeated (while holding a key for a long
   // time, if their handling is nonrepeatable.
   if (nonrepeatable_actions_.find(action) != nonrepeatable_actions_.end() &&
       context_.repeated() && !gesture_event) {
     return true;
   }
   // Type of the previous accelerator. Used by NEXT_IME and DISABLE_CAPS_LOCK.
   const ui::EventType previous_event_type =
     context_.previous_accelerator().type();
+  const ui::KeyboardCode previous_key_code =
+    context_.previous_accelerator().key_code();
 
   // You *MUST* return true when some action is performed. Otherwise, this
   // function might be called *twice*, via BrowserView::PreHandleKeyboardEvent
   // and BrowserView::HandleKeyboardEvent, for a single accelerator press.
   switch (action) {
     case CYCLE_BACKWARD_MRU:
       if (key_code == ui::VKEY_TAB)
         shell->delegate()->RecordUserMetricsAction(UMA_ACCEL_PREVWINDOW_TAB);
       return HandleCycleWindowMRU(WindowCycleController::BACKWARD,
                                   accelerator.IsAltDown());
@@ skipping 69 matching lines @@
             screenshot_delegate_.get());
       }
       // Return true to prevent propagation of the key event because
       // this key combination is reserved for partial screenshot.
       return true;
     case TOGGLE_APP_LIST:
       if (accelerator.key_code() == ui::VKEY_LWIN) {
         // For bindings on the Search key, activate the binding on press if the
         // Search key is not acting as a modifier. Otherwise, activate it on
         // release.
-
-        const ui::KeyboardCode previous_key_code =
-            context_.previous_accelerator().key_code();
-
         const bool search_as_function_key =
             Shell::GetInstance()->delegate()->IsSearchKeyActingAsFunctionKey();
         const bool type_pressed = accelerator.type() == ui::ET_KEY_PRESSED;
 
         if (!search_as_function_key && !type_pressed)
           return false;
         if (search_as_function_key && type_pressed)
           return false;
         if (search_as_function_key &&
             // If something else was pressed between the Search key (LWIN)
             // being pressed and released, then ignore the release of the
             // Search key.
             (previous_event_type == ui::ET_KEY_RELEASED ||
              previous_key_code != ui::VKEY_LWIN)) {
           return false;
         }
       }
       if (key_code == ui::VKEY_LWIN)
         shell->delegate()->RecordUserMetricsAction(UMA_ACCEL_SEARCH_LWIN);
       // When spoken feedback is enabled, we should neither toggle the list nor
       // consume the key since Search+Shift is one of the shortcuts the a11y
       // feature uses. crbug.com/132296
       DCHECK_EQ(ui::VKEY_LWIN, accelerator.key_code());
       if (Shell::GetInstance()->delegate()->IsSpokenFeedbackEnabled())
         return false;
       ash::Shell::GetInstance()->ToggleAppList();
       return true;
     case DISABLE_CAPS_LOCK:
-      // See: case NEXT_IME.
-      if (previous_event_type == ui::ET_KEY_RELEASED) {
-        // We totally ignore this accelerator.
+      if (previous_event_type == ui::ET_KEY_RELEASED ||
+          (previous_key_code != ui::VKEY_LSHIFT &&
+           previous_key_code != ui::VKEY_SHIFT &&
+           previous_key_code != ui::VKEY_RSHIFT)) {
+        // If something else was pressed between the Shift key being pressed
+        // and released, then ignore the release of the Shift key.
         return false;
       }
       if (shell->caps_lock_delegate()->IsCapsLockEnabled()) {
         shell->caps_lock_delegate()->SetCapsLockEnabled(false);
         return true;
       }
       return false;
     case TOGGLE_CAPS_LOCK:
       shell->caps_lock_delegate()->ToggleCapsLock();
       return true;
@@ skipping 62 matching lines @@
       // ET_KEY_RELEASED accelerator for Chrome OS (see ash/accelerators/
       // accelerator_controller.cc) when Shift+Alt+Tab is pressed and then Tab
       // is released.
       if (previous_event_type == ui::ET_KEY_RELEASED &&
           // Workaround for crbug.com/139556. CJK IME users tend to press
           // Enter (or Space) and Shift+Alt almost at the same time to commit
           // an IME string and then switch from the IME to the English layout.
           // This workaround allows the user to trigger NEXT_IME even if the
           // user presses Shift+Alt before releasing Enter.
           // TODO(nona|mazda): Fix crbug.com/139556 in a cleaner way.
-          context_.previous_accelerator().key_code() != ui::VKEY_RETURN &&
-          context_.previous_accelerator().key_code() != ui::VKEY_SPACE) {
+          previous_key_code != ui::VKEY_RETURN &&
+          previous_key_code != ui::VKEY_SPACE) {
         // We totally ignore this accelerator.
         // TODO(mazda): Fix crbug.com/158217
         return false;
       }
       if (ime_control_delegate_.get())
         return ime_control_delegate_->HandleNextIme();
       break;
     case PREVIOUS_IME:
       if (ime_control_delegate_.get())
         return ime_control_delegate_->HandlePreviousIme();
@@ skipping 207 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash