From 06836e38de2dc126b23559d76d683ff2001fce54 Mon Sep 17 00:00:00 2001
From: Alexander Frick <Alex313031@gmail.com>
Date: Fri, 16 Feb 2024 09:55:20 -0600
Subject: [PATCH]  fix windows args, and add ThOS accelerators

---
 arm/android/android_arm32_args.gn  |   2 +-
 arm/android/android_arm64_args.gn  |   2 +-
 arm/win_ARM_args.gn                |   2 +-
 infra/PATCHES.md                   |   3 +
 infra/THORIUM_DEV_BOOKMARKS.html   |   1 +
 other/AVX2/win_AVX2_args.gn        |   2 +-
 other/SSE2/win_SSE2_args.gn        |   2 +-
 other/SSE3/win_SSE3_args.gn        |   2 +-
 src/ash/public/cpp/accelerators.cc | 470 +++++++++++++++++++++++++++++
 win_args.gn                        |   2 +-
 10 files changed, 481 insertions(+), 7 deletions(-)
 create mode 100644 src/ash/public/cpp/accelerators.cc

diff --git a/arm/android/android_arm32_args.gn b/arm/android/android_arm32_args.gn
index c934b374c..8d5b4f581 100644
--- a/arm/android/android_arm32_args.gn
+++ b/arm/android/android_arm32_args.gn
@@ -102,6 +102,6 @@ enable_platform_dts_audio = true
 enable_mse_mpeg2ts_stream_parser = true
 use_thin_lto = true
 thin_lto_enable_optimizations = true
-enable_rust = false
+enable_rust = true
 chrome_pgo_phase = 0
 # pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-android32-main-1696269474-d9cc430a376fd26e31c2c2b532aa055bbc985f6f.profdata"
diff --git a/arm/android/android_arm64_args.gn b/arm/android/android_arm64_args.gn
index 2ecb51e6b..690f1223b 100644
--- a/arm/android/android_arm64_args.gn
+++ b/arm/android/android_arm64_args.gn
@@ -102,6 +102,6 @@ enable_platform_dts_audio = true
 enable_mse_mpeg2ts_stream_parser = true
 use_thin_lto = true
 thin_lto_enable_optimizations = true
-enable_rust = false
+enable_rust = true
 chrome_pgo_phase = 0
 # pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-android64-main-1696269474-c48c320c9092df29383f4fdbb89349e9e30169fe.profdata"
diff --git a/arm/win_ARM_args.gn b/arm/win_ARM_args.gn
index 2dce06011..35580331a 100644
--- a/arm/win_ARM_args.gn
+++ b/arm/win_ARM_args.gn
@@ -19,7 +19,7 @@ exclude_unwind_tables = true
 enable_iterator_debugging = false
 disable_fieldtrial_testing_config = true
 enable_reporting = false
-enable_resource_allowlist_generation = true
+enable_resource_allowlist_generation = false
 enable_profiling = false
 is_component_build = false
 symbol_level = 0
diff --git a/infra/PATCHES.md b/infra/PATCHES.md
index 7d372e3a0..ab7d4fbc5 100644
--- a/infra/PATCHES.md
+++ b/infra/PATCHES.md
@@ -234,6 +234,9 @@ Patches for mini_installer and abseil when using AVX on Windows. Credit goes to
 "Ctrl+Shift+Q" to close all windows (exit) "Ctrl+Shift+K" to open a new tab to the right "Ctrl+Shift+D" to duplicate the current tab "Ctrl+Shift+P" to pop out the current tab into a new window
   - https://github.com/Alex313031/thorium/blob/main/src/chrome/browser/ui/views/accelerator_table.cc
 
+Use Super + Arrow Keys to manage Windows on ThoriumOS > https://github.com/Alex313031/thorium/blob/main/src/ash/public/cpp/accelerators.cc
+  - Made by me
+
 The Thorium .desktop file and content-shell .desktop file have flags added for experimental and useful features, namely: Disabling the Default Browser check and InfoBar, Experimental web platform features, and Experimental Canvas2D.
   - Modified by me.
 
diff --git a/infra/THORIUM_DEV_BOOKMARKS.html b/infra/THORIUM_DEV_BOOKMARKS.html
index c7d378de8..2a161faf1 100644
--- a/infra/THORIUM_DEV_BOOKMARKS.html
+++ b/infra/THORIUM_DEV_BOOKMARKS.html
@@ -215,6 +215,7 @@ <H1>Bookmarks</H1>
             <DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/121.0.6167.204:components/user_education/common/feature_promo_controller.cc;bpv=1" ADD_DATE="1691750173" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">feature_promo_controller.cc - Chromium Code Search</A>
             <DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/121.0.6167.204:content/common/gpu_pre_sandbox_hook_linux.cc;bpv=1" ADD_DATE="1691750173" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">gpu_pre_sandbox_hook_linux.cc - Chromium Code Search</A>
             <DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/121.0.6167.204:chrome/browser/download/bubble/download_bubble_prefs.cc;bpv=1" ADD_DATE="1691750173" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">download_bubble_prefs.cc - Chromium Code Search</A>
+            <DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/121.0.6167.204:ash/public/cpp/accelerators.cc;bpv=1" ADD_DATE="1691750173" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">accelerators.cc - Chromium Code Search</A>
             <DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/121.0.6167.204:third_party/libaom/;bpv=1" ADD_DATE="1691750173" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">libaom - Chromium Code Search</A>
             <DT><A HREF="https://source.chromium.org/chromium/chromium/src/+/refs/tags/121.0.6167.204:third_party/libvpx/;bpv=1" ADD_DATE="1691750173" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADIUlEQVQ4jW1TXWwUZRQ955ufnZ3dlm4VpE2Q+lND1cSQYDBaKY2VEkUFa1d9K4laBROEIg+mDfvkg5Bu9MWoD/hkTJdqJBFCMRENEqONRkMbIiWGWn5SjWw7OzO7szPf9UFCCnrebu7JuTc55xA3QURYKkEtXw7+1gDm0mDWBtMm+GcAnb+P0VI+lw4fTIp7C6O7dU3nlKFyisxp0TmDRpMmmyDSCqLY96D1HUQIUsxrd9nfD3VrHDbDTi/ENi5V/TCdtmlQ0Y60dmwANNXT0HpodEx+2kNUb/4e45PSUhBR/1lcw6Gvf3fGf4gmJn6NBgGgUBBFAHj+vepdKSvp2r5m/pPu7juqA4fEOTcXvhaG2KAMVjOp5MjJ4eynBOTIz7Vnzs5Jcfoiej9+1TlHAHjyneArKrl/XcVtnQLcS/A/b23J9DzUBgQRcPo84JX90VOF7JCIGFsOBLMCTB/dl3lc9b+7uA1O+jHb4OuFAvVl+oOtLZmekc1JbUc36nt7pb6zK0mslL2n6+3wUZJJyuIuOm7Ps8Xyc8qP3Q+TMDj+2W73MABUatK5vg26vcVQf3navOqL+Ui7kay53dJeEG8AgPE33PEkDI6HSfZ9BRFAQJF/LSVYDSIQEBiKsE0lsRaGNSiTEl43X4SAQKWN8GUj427qG/XyAJB15IvTM+CJKW04FuoiEpd+1Grmj8BvzPIYAGwten2mm9mUsauDBIAnDvgnAHQMrHZX5/NMOguLBy07NXTPKhvVGnDhb0BH3pvfDjcelDExnpoNLormmS/3uT0KAFY0xDs2dhiLqXZsBoBThca9QK1z8mxlZPpCZZeq+2dMqi2AcGYtzOZG9dayrHoFACgiJCkTU9FAJZCtCxX7he3dvCFl60b8ta6lh2/T2Rdf2oam3gc4f2MXRLi7NOd0tq34iFS/aNFHIwBhJLGVSLRqZd3rWNYQfj+L5igOdb6YvoISNEC5LgBSDk9G6ynYScgVrbGgFMsQKSdiLIhIWSe6rGifzz/M8H/bCABjU2L781BeOCMrK5FcvfNeuexB8M1J7N+/MSEpS/n/AGH0clblBN69AAAAAElFTkSuQmCC">libvpx - Chromium Code Search</A>
             <DT><H3 ADD_DATE="1706580118" LAST_MODIFIED="1706580342">VectorIcons</H3>
diff --git a/other/AVX2/win_AVX2_args.gn b/other/AVX2/win_AVX2_args.gn
index 0c7ea15d5..ee233c8da 100644
--- a/other/AVX2/win_AVX2_args.gn
+++ b/other/AVX2/win_AVX2_args.gn
@@ -17,7 +17,7 @@ exclude_unwind_tables = true
 enable_iterator_debugging = false
 disable_fieldtrial_testing_config = true
 enable_reporting = false
-enable_resource_allowlist_generation = true
+enable_resource_allowlist_generation = false
 enable_profiling = false
 is_component_build = false
 symbol_level = 0
diff --git a/other/SSE2/win_SSE2_args.gn b/other/SSE2/win_SSE2_args.gn
index 6be96e22f..7f449c94b 100644
--- a/other/SSE2/win_SSE2_args.gn
+++ b/other/SSE2/win_SSE2_args.gn
@@ -18,7 +18,7 @@ exclude_unwind_tables = true
 enable_iterator_debugging = false
 disable_fieldtrial_testing_config = true
 enable_reporting = false
-enable_resource_allowlist_generation = true
+enable_resource_allowlist_generation = false
 enable_profiling = false
 is_component_build = false
 symbol_level = 0
diff --git a/other/SSE3/win_SSE3_args.gn b/other/SSE3/win_SSE3_args.gn
index b7b6c7f67..f8ef729d0 100644
--- a/other/SSE3/win_SSE3_args.gn
+++ b/other/SSE3/win_SSE3_args.gn
@@ -17,7 +17,7 @@ exclude_unwind_tables = true
 enable_iterator_debugging = false
 disable_fieldtrial_testing_config = true
 enable_reporting = false
-enable_resource_allowlist_generation = true
+enable_resource_allowlist_generation = false
 enable_profiling = false
 is_component_build = false
 symbol_level = 0
diff --git a/src/ash/public/cpp/accelerators.cc b/src/ash/public/cpp/accelerators.cc
new file mode 100644
index 000000000..fd32da48f
--- /dev/null
+++ b/src/ash/public/cpp/accelerators.cc
@@ -0,0 +1,470 @@
+// Copyright 2024 The Chromium Authors and Alex313031
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/public/cpp/accelerators.h"
+
+#include "base/feature_list.h"
+#include "base/functional/callback.h"
+#include "base/no_destructor.h"
+#include "media/base/media_switches.h"
+
+namespace ash {
+
+namespace {
+
+AcceleratorController* g_instance = nullptr;
+
+base::RepeatingClosure* GetVolumeAdjustmentCallback() {
+  static base::NoDestructor<base::RepeatingClosure> callback;
+  return callback.get();
+}
+
+}  // namespace
+
+//  If you plan on adding a new accelerator and want it displayed in the
+//  Shortcuts app, please follow the instructions at:
+// `ash/webui/shortcut_customization_ui/backend/accelerator_layout_table.h`.
+const AcceleratorData kAcceleratorData[] = {
+    {true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kSwitchToLastUsedIme},
+    {false, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kSwitchToLastUsedIme},
+    {true, ui::VKEY_TAB, ui::EF_ALT_DOWN, AcceleratorAction::kCycleForwardMru},
+    {true, ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kCycleBackwardMru},
+    {true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE,
+     AcceleratorAction::kToggleOverview},
+    // Historically, the browser search key with and without the shift key can
+    // toggle the app list into different open states. Now the two combinations
+    // are used to toggle the app list in the same way to keep the behavior
+    // consistent.
+    {true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE,
+     AcceleratorAction::kToggleAppList},
+    {true, ui::VKEY_BROWSER_SEARCH, ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kToggleAppList},
+    {true, ui::VKEY_ALL_APPLICATIONS, ui::EF_NONE,
+     AcceleratorAction::kToggleAppList},
+    {true, ui::VKEY_WLAN, ui::EF_NONE, AcceleratorAction::kToggleWifi},
+    {true, ui::VKEY_PRIVACY_SCREEN_TOGGLE, ui::EF_NONE,
+     AcceleratorAction::kPrivacyScreenToggle},
+    {true, ui::VKEY_MICROPHONE_MUTE_TOGGLE, ui::EF_NONE,
+     AcceleratorAction::kMicrophoneMuteToggle},
+    {true, ui::VKEY_M, ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kMicrophoneMuteToggle},
+    {true, ui::VKEY_KBD_BACKLIGHT_TOGGLE, ui::EF_NONE,
+     AcceleratorAction::kKeyboardBacklightToggle},
+    {true, ui::VKEY_KBD_BRIGHTNESS_DOWN, ui::EF_NONE,
+     AcceleratorAction::kKeyboardBrightnessDown},
+    {true, ui::VKEY_KBD_BRIGHTNESS_UP, ui::EF_NONE,
+     AcceleratorAction::kKeyboardBrightnessUp},
+    // Maximize button.
+    {true, ui::VKEY_ZOOM, ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kToggleMirrorMode},
+    {true, ui::VKEY_ZOOM, ui::EF_ALT_DOWN,
+     AcceleratorAction::kSwapPrimaryDisplay},
+    // Cycle windows button.
+    {true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kTakeScreenshot},
+    {true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kTakePartialScreenshot},
+    {true, ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_ALT_DOWN | ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kTakeWindowScreenshot},
+    {true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE,
+     AcceleratorAction::kBrightnessDown},
+    {true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_ALT_DOWN,
+     AcceleratorAction::kKeyboardBrightnessDown},
+    {true, ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE,
+     AcceleratorAction::kBrightnessUp},
+    {true, ui::VKEY_BRIGHTNESS_UP, ui::EF_ALT_DOWN,
+     AcceleratorAction::kKeyboardBrightnessUp},
+    {true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kMagnifierZoomOut},
+    {true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kMagnifierZoomIn},
+    {true, ui::VKEY_L, ui::EF_COMMAND_DOWN, AcceleratorAction::kLockScreen},
+    {true, ui::VKEY_L, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kSuspend},
+    // The lock key on Chrome OS keyboards produces F13 scancodes.
+    {true, ui::VKEY_F13, ui::EF_NONE, AcceleratorAction::kLockPressed},
+    {false, ui::VKEY_F13, ui::EF_NONE, AcceleratorAction::kLockReleased},
+    // Generic keyboards can use VKEY_SLEEP to mimic ChromeOS keyboard's lock
+    // key.
+    {true, ui::VKEY_SLEEP, ui::EF_NONE, AcceleratorAction::kLockPressed},
+    {false, ui::VKEY_SLEEP, ui::EF_NONE, AcceleratorAction::kLockReleased},
+    {true, ui::VKEY_POWER, ui::EF_NONE, AcceleratorAction::kPowerPressed},
+    {false, ui::VKEY_POWER, ui::EF_NONE, AcceleratorAction::kPowerReleased},
+    {true, ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE,
+     AcceleratorAction::kOpenCalculator},
+    {true, ui::VKEY_ESCAPE, ui::EF_CONTROL_DOWN | ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kOpenDiagnostics},
+    {true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kOpenFileManager},
+    {true, ui::VKEY_H, ui::EF_COMMAND_DOWN, AcceleratorAction::kOpenGetHelp},
+    {true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kOpenCrosh},
+    {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kTouchHudModeChange},
+    {true, ui::VKEY_I,
+     ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kTouchHudClear},
+    {true, ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kToggleHighContrast},
+    {true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kToggleSpokenFeedback},
+    {true, ui::VKEY_D, ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kEnableOrToggleDictation},
+    {true, ui::VKEY_DICTATE, ui::EF_NONE,
+     AcceleratorAction::kEnableOrToggleDictation},
+    {true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kSwitchToPreviousUser},
+    {true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kSwitchToNextUser},
+    // Single shift release turns off caps lock.
+    {false, ui::VKEY_LSHIFT, ui::EF_NONE, AcceleratorAction::kDisableCapsLock},
+    {false, ui::VKEY_SHIFT, ui::EF_NONE, AcceleratorAction::kDisableCapsLock},
+    {false, ui::VKEY_RSHIFT, ui::EF_NONE, AcceleratorAction::kDisableCapsLock},
+    {true, ui::VKEY_C, ui::EF_COMMAND_DOWN, AcceleratorAction::kToggleCalendar},
+    // Accelerators to toggle Caps Lock.
+    // The following is triggered when Search is released while Alt is still
+    // down. The key_code here is LWIN (for search) and Alt is a modifier.
+    {false, ui::VKEY_LWIN, ui::EF_ALT_DOWN, AcceleratorAction::kToggleCapsLock},
+    // The following is triggered when Alt is released while search is still
+    // down. The key_code here is MENU (for Alt) and Search is a modifier
+    // (EF_COMMAND_DOWN is used for Search as a modifier).
+    {false, ui::VKEY_MENU, ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kToggleCapsLock},
+    {true, ui::VKEY_V, ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kToggleClipboardHistory},
+    {true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kPasteClipboardHistoryPlainText},
+    {true, ui::VKEY_VOLUME_MUTE, ui::EF_NONE, AcceleratorAction::kVolumeMute},
+    {true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, AcceleratorAction::kVolumeDown},
+    {true, ui::VKEY_VOLUME_UP, ui::EF_NONE, AcceleratorAction::kVolumeUp},
+    {true, ui::VKEY_ESCAPE, ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kShowTaskManager},
+    {true, ui::VKEY_SPACE, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kSwitchToNextIme},
+    {true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kOpenFeedbackPage},
+    {true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kExit},
+    {true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kNewIncognitoWindow},
+    {true, ui::VKEY_N, ui::EF_CONTROL_DOWN, AcceleratorAction::kNewWindow},
+    {true, ui::VKEY_T, ui::EF_CONTROL_DOWN, AcceleratorAction::kNewTab},
+    {true, ui::VKEY_NEW, ui::EF_NONE, AcceleratorAction::kNewTab},
+    {true, ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kScaleUiUp},
+    {true, ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kScaleUiDown},
+    {true, ui::VKEY_0, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kScaleUiReset},
+    {true, ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kRotateScreen},
+    {true, ui::VKEY_BROWSER_REFRESH,
+     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kRotateWindow},
+    {true, ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kRestoreTab},
+    // This corresponds to the "Print Screen" key.
+    {true, ui::VKEY_SNAPSHOT, ui::EF_NONE, AcceleratorAction::kTakeScreenshot},
+    {true, ui::VKEY_SNAPSHOT, ui::EF_ALT_DOWN,
+     AcceleratorAction::kTakePartialScreenshot},
+    // On Chrome OS, Search key is mapped to LWIN. The Search key binding should
+    // act on release instead of press when using Search as a modifier key for
+    // extended keyboard shortcuts.
+    {false, ui::VKEY_LWIN, ui::EF_NONE, AcceleratorAction::kToggleAppList},
+    {false, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kToggleAppList},
+    {true, ui::VKEY_ZOOM, ui::EF_NONE, AcceleratorAction::kToggleFullscreen},
+    {true, ui::VKEY_ZOOM, ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kToggleFullscreen},
+    {true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kUnpin},
+    {true, ui::VKEY_S, ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kFocusCameraPreview},
+    {true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kFocusShelf},
+    {true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kFocusPip},
+    {true, ui::VKEY_HELP, ui::EF_NONE, AcceleratorAction::kOpenGetHelp},
+    {true, ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kShowShortcutViewer},
+    {true, ui::VKEY_F14, ui::EF_NONE, AcceleratorAction::kShowShortcutViewer},
+    {true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kToggleMessageCenterBubble},
+    {true, ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kToggleStylusTools},
+    {true, ui::VKEY_X, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kStopScreenRecording},
+    {true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kToggleSystemTrayBubble},
+    // Until we have unified settings and notifications the "hamburger"
+    // key opens quick settings.
+    {true, ui::VKEY_SETTINGS, ui::EF_NONE,
+     AcceleratorAction::kToggleSystemTrayBubble},
+    {true, ui::VKEY_K, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kToggleImeMenuBubble},
+    {true, ui::VKEY_1, ui::EF_ALT_DOWN, AcceleratorAction::kLaunchApp0},
+    {true, ui::VKEY_2, ui::EF_ALT_DOWN, AcceleratorAction::kLaunchApp1},
+    {true, ui::VKEY_3, ui::EF_ALT_DOWN, AcceleratorAction::kLaunchApp2},
+    {true, ui::VKEY_4, ui::EF_ALT_DOWN, AcceleratorAction::kLaunchApp3},
+    {true, ui::VKEY_5, ui::EF_ALT_DOWN, AcceleratorAction::kLaunchApp4},
+    {true, ui::VKEY_6, ui::EF_ALT_DOWN, AcceleratorAction::kLaunchApp5},
+    {true, ui::VKEY_7, ui::EF_ALT_DOWN, AcceleratorAction::kLaunchApp6},
+    {true, ui::VKEY_8, ui::EF_ALT_DOWN, AcceleratorAction::kLaunchApp7},
+    {true, ui::VKEY_9, ui::EF_ALT_DOWN, AcceleratorAction::kLaunchLastApp},
+
+    // Window management shortcuts.
+    {true, ui::VKEY_LEFT, ui::VKEY_LWIN,
+     AcceleratorAction::kWindowCycleSnapLeft},
+    {true, ui::VKEY_RIGHT, ui::VKEY_LWIN,
+     AcceleratorAction::kWindowCycleSnapRight},
+    {true, ui::VKEY_DOWN, ui::VKEY_LWIN,
+     AcceleratorAction::kWindowMinimize},
+    {true, ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kToggleFloating},
+    {true, ui::VKEY_UP, ui::VKEY_LWIN,
+     AcceleratorAction::kToggleMaximized},
+    {true, ui::VKEY_BROWSER_FORWARD, ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kFocusNextPane},
+    {true, ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kFocusPreviousPane},
+    {true, ui::VKEY_BROWSER_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kFocusNextPane},
+    {true, ui::VKEY_BROWSER_BACK, ui::EF_NONE,
+     AcceleratorAction::kMinimizeTopWindowOnBack},
+    {true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kToggleSnapGroupWindowsGroupAndUngroup},
+    {true, ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kToggleSnapGroupWindowsMinimizeAndRestore},
+    {true, ui::VKEY_Z, ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kToggleMultitaskMenu},
+
+    // Moving active window between displays shortcut.
+    {true, ui::VKEY_M, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kMoveActiveWindowBetweenDisplays},
+
+    // Magnifiers shortcuts.
+    {true, ui::VKEY_D, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kToggleDockedMagnifier},
+    {true, ui::VKEY_M, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN,
+     AcceleratorAction::kToggleFullscreenMagnifier},
+
+    // Media Player shortcuts.
+    {true, ui::VKEY_MEDIA_NEXT_TRACK, ui::EF_NONE,
+     AcceleratorAction::kMediaNextTrack},
+    {true, ui::VKEY_PAUSE, ui::EF_NONE, AcceleratorAction::kMediaPause},
+    {true, ui::VKEY_PLAY, ui::EF_NONE, AcceleratorAction::kMediaPlay},
+    {true, ui::VKEY_MEDIA_PAUSE, ui::EF_NONE, AcceleratorAction::kMediaPause},
+    {true, ui::VKEY_MEDIA_PLAY, ui::EF_NONE, AcceleratorAction::kMediaPlay},
+    {true, ui::VKEY_MEDIA_PLAY_PAUSE, ui::EF_NONE,
+     AcceleratorAction::kMediaPlayPause},
+    {true, ui::VKEY_MEDIA_PREV_TRACK, ui::EF_NONE,
+     AcceleratorAction::kMediaPrevTrack},
+    {true, ui::VKEY_MEDIA_STOP, ui::EF_NONE, AcceleratorAction::kMediaStop},
+    {true, ui::VKEY_OEM_103, ui::EF_NONE, AcceleratorAction::kMediaRewind},
+    {true, ui::VKEY_OEM_104, ui::EF_NONE, AcceleratorAction::kMediaFastForward},
+
+    // Assistant shortcuts.
+    {true, ui::VKEY_A, ui::EF_COMMAND_DOWN, AcceleratorAction::kStartAssistant},
+    {true, ui::VKEY_ASSISTANT, ui::EF_NONE, AcceleratorAction::kStartAssistant},
+
+    // IME mode change key.
+    {true, ui::VKEY_MODECHANGE, ui::EF_NONE,
+     AcceleratorAction::kSwitchToNextIme},
+
+    // Emoji picker shortcut.
+    {true, ui::VKEY_SPACE, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kShowEmojiPicker},
+    {true, ui::VKEY_EMOJI_PICKER, ui::EF_NONE,
+     AcceleratorAction::kShowEmojiPicker},
+
+    // Debugging shortcuts that need to be available to end-users in
+    // release builds.
+    {true, ui::VKEY_U, kDebugModifier, AcceleratorAction::kPrintUiHierarchies},
+
+    // Virtual Desks shortcuts.
+    // Desk activation:
+    {true, ui::VKEY_OEM_4, ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kDesksActivateDeskLeft},
+    {true, ui::VKEY_OEM_6, ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kDesksActivateDeskRight},
+    // Moving windows to desks:
+    {true, ui::VKEY_OEM_4, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kDesksMoveActiveItemLeft},
+    {true, ui::VKEY_OEM_6, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kDesksMoveActiveItemRight},
+    // TODO(afakhry): Implement moving windows to a desk by its index directly.
+
+    // TODO(yusukes): Handle VKEY_MEDIA_STOP, and VKEY_MEDIA_LAUNCH_MAIL.
+
+    // ARC-specific shortcut.
+    {true, ui::VKEY_C, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kToggleResizeLockMenu},
+
+    // Projector shortcuts.
+    {true, ui::VKEY_OEM_3, ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kToggleProjectorMarker},
+};
+
+const size_t kAcceleratorDataLength = std::size(kAcceleratorData);
+
+const AcceleratorData kDisableWithNewMappingAcceleratorData[] = {
+    // Desk creation and removal:
+    // Due to https://crbug.com/976487, Search + "=" is always automatically
+    // rewritten to F12, and so is Search + "-" to F11. So we had to implement
+    // the following two shortcuts as Shift + F11/F12 until we resolve the above
+    // issue, accepting the fact that these two shortcuts might sometimes be
+    // consumed by apps and pages (since they're not search-based).
+    // TODO(afakhry): Change the following to Search+Shift+"+"/"-" once
+    // https://crbug.com/976487 is fixed.
+    {true, ui::VKEY_F12, ui::EF_SHIFT_DOWN, AcceleratorAction::kDesksNewDesk},
+    {true, ui::VKEY_F11, ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kDesksRemoveCurrentDesk},
+};
+
+const size_t kDisableWithNewMappingAcceleratorDataLength =
+    std::size(kDisableWithNewMappingAcceleratorData);
+
+const AcceleratorData kEnableWithPositionalAcceleratorsData[] = {
+    // These are the desk shortcuts as advertised, but previously
+    // they were implicitly implemented in terms of F11 and F12
+    // due to event rewrites. Since the F-Key rewrites are deprecated
+    // these can be implemented based on the keys they actually are.
+    //
+    // TODO(crbug.com/1179893): Merge these to the main table once
+    // IsImprovedKeyboardShortcutsEnabled() is permanently enabled.
+    {true, ui::VKEY_OEM_PLUS, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kDesksNewDesk},
+    {true, ui::VKEY_OEM_MINUS, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+     AcceleratorAction::kDesksRemoveCurrentDesk},
+};
+
+const size_t kEnableWithPositionalAcceleratorsDataLength =
+    std::size(kEnableWithPositionalAcceleratorsData);
+
+const AcceleratorData
+    kEnabledWithImprovedDesksKeyboardShortcutsAcceleratorData[] = {
+        // Indexed-desk activation:
+        {true, ui::VKEY_1, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+         AcceleratorAction::kDesksActivate0},
+        {true, ui::VKEY_2, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+         AcceleratorAction::kDesksActivate1},
+        {true, ui::VKEY_3, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+         AcceleratorAction::kDesksActivate2},
+        {true, ui::VKEY_4, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+         AcceleratorAction::kDesksActivate3},
+        {true, ui::VKEY_5, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+         AcceleratorAction::kDesksActivate4},
+        {true, ui::VKEY_6, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+         AcceleratorAction::kDesksActivate5},
+        {true, ui::VKEY_7, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+         AcceleratorAction::kDesksActivate6},
+        {true, ui::VKEY_8, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+         AcceleratorAction::kDesksActivate7},
+        // Toggle assign to all desks:
+        {true, ui::VKEY_A, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN,
+         AcceleratorAction::kDesksToggleAssignToAllDesks},
+};
+
+const size_t kEnabledWithImprovedDesksKeyboardShortcutsAcceleratorDataLength =
+    std::size(kEnabledWithImprovedDesksKeyboardShortcutsAcceleratorData);
+
+const AcceleratorData kEnableWithSameAppWindowCycleAcceleratorData[] = {
+    {true, ui::VKEY_OEM_3, ui::EF_ALT_DOWN,
+     AcceleratorAction::kCycleSameAppWindowsForward},
+    {true, ui::VKEY_OEM_3, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
+     AcceleratorAction::kCycleSameAppWindowsBackward},
+};
+
+const size_t kEnableWithSameAppWindowCycleAcceleratorDataLength =
+    std::size(kEnableWithSameAppWindowCycleAcceleratorData);
+
+const AcceleratorData kToggleGameDashboardAcceleratorData[] = {
+    {true, ui::VKEY_G, ui::EF_COMMAND_DOWN,
+     AcceleratorAction::kToggleGameDashboard},
+};
+
+const size_t kToggleGameDashboardAcceleratorDataLength =
+    std::size(kToggleGameDashboardAcceleratorData);
+
+// static
+AcceleratorController* AcceleratorController::Get() {
+  return g_instance;
+}
+
+// static
+void AcceleratorController::SetVolumeAdjustmentSoundCallback(
+    const base::RepeatingClosure& closure) {
+  DCHECK(GetVolumeAdjustmentCallback()->is_null() || closure.is_null());
+  *GetVolumeAdjustmentCallback() = std::move(closure);
+}
+
+// static
+void AcceleratorController::PlayVolumeAdjustmentSound() {
+  if (*GetVolumeAdjustmentCallback())
+    GetVolumeAdjustmentCallback()->Run();
+}
+
+// static
+bool AcceleratorController::IsSystemKey(ui::KeyboardCode key_code) {
+  switch (key_code) {
+    case ui::VKEY_ASSISTANT:
+    case ui::VKEY_ZOOM:               // Fullscreen button.
+    case ui::VKEY_MEDIA_LAUNCH_APP1:  // Overview button.
+    case ui::VKEY_BRIGHTNESS_DOWN:
+    case ui::VKEY_BRIGHTNESS_UP:
+    case ui::VKEY_KBD_BRIGHTNESS_DOWN:
+    case ui::VKEY_KBD_BRIGHTNESS_UP:
+    case ui::VKEY_VOLUME_MUTE:
+    case ui::VKEY_VOLUME_DOWN:
+    case ui::VKEY_VOLUME_UP:
+    case ui::VKEY_POWER:
+    case ui::VKEY_SLEEP:
+    case ui::VKEY_F13:  // Lock button on some chromebooks emits F13.
+    case ui::VKEY_PRIVACY_SCREEN_TOGGLE:
+    case ui::VKEY_SETTINGS:
+      return true;
+    case ui::VKEY_MEDIA_NEXT_TRACK:
+    case ui::VKEY_MEDIA_PAUSE:
+    case ui::VKEY_MEDIA_PLAY:
+    case ui::VKEY_MEDIA_PLAY_PAUSE:
+    case ui::VKEY_MEDIA_PREV_TRACK:
+    case ui::VKEY_MEDIA_STOP:
+    case ui::VKEY_OEM_103:  // KEYCODE_MEDIA_REWIND
+    case ui::VKEY_OEM_104:  // KEYCODE_MEDIA_FAST_FORWARD
+      return base::FeatureList::IsEnabled(media::kHardwareMediaKeyHandling);
+    default:
+      return false;
+  }
+}
+
+void AcceleratorController::AddObserver(Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void AcceleratorController::RemoveObserver(Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
+AcceleratorController::AcceleratorController() {
+  DCHECK_EQ(nullptr, g_instance);
+  g_instance = this;
+}
+
+AcceleratorController::~AcceleratorController() {
+  for (auto& obs : observers_)
+    obs.OnAcceleratorControllerWillBeDestroyed(this);
+
+  DCHECK_EQ(this, g_instance);
+  g_instance = nullptr;
+}
+
+void AcceleratorController::NotifyActionPerformed(AcceleratorAction action) {
+  for (Observer& observer : observers_)
+    observer.OnActionPerformed(action);
+}
+
+}  // namespace ash
diff --git a/win_args.gn b/win_args.gn
index 0c7ea15d5..ee233c8da 100644
--- a/win_args.gn
+++ b/win_args.gn
@@ -17,7 +17,7 @@ exclude_unwind_tables = true
 enable_iterator_debugging = false
 disable_fieldtrial_testing_config = true
 enable_reporting = false
-enable_resource_allowlist_generation = true
+enable_resource_allowlist_generation = false
 enable_profiling = false
 is_component_build = false
 symbol_level = 0