Enable Search-key modifiers for extended key shortcuts.

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 519 matching lines @@
       return true;
     case TAKE_PARTIAL_SCREENSHOT:
       if (screenshot_delegate_.get()) {
         ash::PartialScreenshotView::StartPartialScreenshot(
             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 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)
+      if (key_code == ui::VKEY_LWIN) {
+        // If something else was pressed between the Search key (LWIN)
+        // being pressed and released, then ignore the release of the
+        // Search key.
+        if (previous_event_type == ui::ET_KEY_RELEASED ||

[sky, 2012/12/17 22:29:00]

nit: combine ifs.

[danakj, 2012/12/17 22:32:13]

Done.

+            previous_key_code != ui::VKEY_LWIN)
           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(NULL);
@@ skipping 281 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash