Disable the deprecated Alt+Shift for NEXT_IME

ash/accelerators/accelerator_table.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_table.h"
 
 #include "ash/strings/grit/ash_strings.h"
 #include "base/macros.h"
 
 namespace ash {
@@ skipping 80 matching lines @@
   { true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, VOLUME_MUTE },
   { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN },
   { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP },
   { true, ui::VKEY_ESCAPE, ui::EF_COMMAND_DOWN, SHOW_TASK_MANAGER },
   { true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, NEXT_IME },
 #else
   // This key has been deprecated on CrOS. It is instead included below in the
   // |kDeprecatedAccelerators|, and above in the CrOS accelerators as
   // Search+Esc.
   { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER },
-  // The below keys have been deprecated on ChromeOS and were replaced above by
-  // Ctrl+Shift+Space. crbug.com/535004.
-  // We have to define 3 entries for Shift+Alt. VKEY_[LR]MENU might be sent to
-  // the accelerator controller when RenderWidgetHostViewAura is focused, and
-  // VKEY_MENU might be when it's not (e.g. when NativeWidgetAura is focused).
-  { false, ui::VKEY_LMENU, ui::EF_SHIFT_DOWN, NEXT_IME },
-  { false, ui::VKEY_MENU, ui::EF_SHIFT_DOWN, NEXT_IME },
-  { false, ui::VKEY_RMENU, ui::EF_SHIFT_DOWN, NEXT_IME },
-  // The same is true for Alt+Shift.
-  { false, ui::VKEY_LSHIFT, ui::EF_ALT_DOWN, NEXT_IME },
-  { false, ui::VKEY_SHIFT, ui::EF_ALT_DOWN, NEXT_IME },
-  { false, ui::VKEY_RSHIFT, ui::EF_ALT_DOWN, NEXT_IME },
 #endif  // defined(OS_CHROMEOS)
   { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE },
 #if !defined(OS_WIN)
   { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT },
 #endif
   { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     NEW_INCOGNITO_WINDOW },
   { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW },
   { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB },
   { true, ui::VKEY_OEM_MINUS,
@@ skipping 116 matching lines @@
     IDS_SHORTCUT_TASK_MANAGER_OLD,
     IDS_SHORTCUT_TASK_MANAGER_NEW,
     true
   },
   {
     NEXT_IME,
     "Ash.Accelerators.Deprecated.NextIME",
     IDS_DEPRECATED_NEXT_IME_MSG,
     IDS_SHORTCUT_NEXT_IME_OLD,
     IDS_SHORTCUT_NEXT_IME_NEW,
-    true
+    false  // Old accelerator has been disabled.
   }
 };
 
 const size_t kDeprecatedAcceleratorsDataLength =
     arraysize(kDeprecatedAcceleratorsData);
 
 #endif  // defined(OS_CHROMEOS)
 
 const AcceleratorData kDebugAcceleratorData[] = {
 #if defined(OS_CHROMEOS)
@@ skipping 182 matching lines @@
 };
 
 const size_t kActionsAllowedAtModalWindowLength =
     arraysize(kActionsAllowedAtModalWindow);
 
 const AcceleratorAction kNonrepeatableActions[] = {
     // TODO(mazda): Add other actions which should not be repeated.
     CYCLE_BACKWARD_MRU,
     CYCLE_FORWARD_MRU,
     EXIT,
+    NEXT_IME,
+    PREVIOUS_IME,
     OPEN_FEEDBACK_PAGE,
     PRINT_UI_HIERARCHIES,  // Don't fill the logs if the key is held down.
     ROTATE_SCREEN,
     ROTATE_WINDOW,
     SCALE_UI_UP,
     SCALE_UI_DOWN,
     SCALE_UI_RESET,
     TAKE_WINDOW_SCREENSHOT,
     TAKE_PARTIAL_SCREENSHOT,
     TAKE_SCREENSHOT,
@@ skipping 95 matching lines @@
     TOGGLE_WIFI,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
 #endif  // defined(OS_CHROMEOS)
 };
 
 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
 
 }  // namespace ash