Disable the old lock-screen shortcut

ash/common/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/common/accelerators/accelerator_table.h"
 
 #include "ash/common/strings/grit/ash_strings.h"
 #include "base/macros.h"
 
 namespace ash {
@@ skipping 197 matching lines @@
     {false, ui::VKEY_MENU, ui::EF_SHIFT_DOWN, NEXT_IME},
     {false, ui::VKEY_RMENU, ui::EF_SHIFT_DOWN, NEXT_IME},
     {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},
 };
 
 const size_t kDeprecatedAcceleratorsLength = arraysize(kDeprecatedAccelerators);
 
 const DeprecatedAcceleratorData kDeprecatedAcceleratorsData[] = {
-    {LOCK_SCREEN, "Ash.Accelerators.Deprecated.LockScreen",
-     IDS_DEPRECATED_LOCK_SCREEN_MSG, IDS_SHORTCUT_LOCK_SCREEN_OLD,
-     IDS_SHORTCUT_LOCK_SCREEN_NEW, true},
+    {
+        LOCK_SCREEN, "Ash.Accelerators.Deprecated.LockScreen",
+        IDS_DEPRECATED_LOCK_SCREEN_MSG, IDS_SHORTCUT_LOCK_SCREEN_OLD,
+        IDS_SHORTCUT_LOCK_SCREEN_NEW,
+        false  // Old accelerator was disabled in M56.

[James Cook, 2016/11/14 22:09:10]

I like how you mentioned the milestone in the comment. It makes it much easier
for later readers to figure out when it can be totally removed.

[afakhry, 2016/11/14 22:48:47]

Thanks! That was the intent. :)

+    },
     {SHOW_TASK_MANAGER, "Ash.Accelerators.Deprecated.ShowTaskManager",
      IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG, 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,
         false  // Old accelerator has been disabled.
     }};
 
@@ skipping 301 matching lines @@
     TOGGLE_WIFI,
     VOLUME_DOWN,
     VOLUME_MUTE,
     VOLUME_UP,
 #endif  // defined(OS_CHROMEOS)
 };
 
 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen);
 
 }  // namespace ash