Event Rewrite Deprecations: Show notifications for F-Key rewrites
- Show notifications when users press Search+Digit to generate an
F-Key
- Adds additional tests for notification controller
- Add additional tests to detect notifications in event rewriter unit
tests
Bug: 1174326
Test: unit_tests --gtest_filter=EventRewriterTest.*
Change-Id: I27d190911df61fbdb1d1368372a65875d2bd4c0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2787235
Reviewed-by: James Cook <[email protected]>
Commit-Queue: Zentaro Kavanagh <[email protected]>
Cr-Commit-Position: refs/heads/master@{#866821}
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index a9bf85c8..b263b39 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -1870,57 +1870,78 @@
scoped_feature_list_.InitAndEnableFeature(
::features::kImprovedKeyboardShortcuts);
TestNonAppleNonCustomLayoutKeyboardVariants({
- // Search+Number should now have no effect.
+ // Search+Number should now have no effect but a notification will
+ // be shown the first time F1 to F10 is pressed.
{ui::ET_KEY_PRESSED,
{ui::VKEY_1, ui::DomCode::DIGIT1, ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'1'>::Character},
{ui::VKEY_1, ui::DomCode::DIGIT1, ui::EF_COMMAND_DOWN,
- ui::DomKey::Constant<'1'>::Character}},
+ ui::DomKey::Constant<'1'>::Character},
+ kKeyboardDeviceId,
+ /*triggers_notification=*/true},
{ui::ET_KEY_PRESSED,
{ui::VKEY_2, ui::DomCode::DIGIT2, ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'2'>::Character},
{ui::VKEY_2, ui::DomCode::DIGIT2, ui::EF_COMMAND_DOWN,
- ui::DomKey::Constant<'2'>::Character}},
+ ui::DomKey::Constant<'2'>::Character},
+ kKeyboardDeviceId,
+ /*triggers_notification=*/true},
{ui::ET_KEY_PRESSED,
{ui::VKEY_3, ui::DomCode::DIGIT3, ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'3'>::Character},
{ui::VKEY_3, ui::DomCode::DIGIT3, ui::EF_COMMAND_DOWN,
- ui::DomKey::Constant<'3'>::Character}},
+ ui::DomKey::Constant<'3'>::Character},
+ kKeyboardDeviceId,
+ /*triggers_notification=*/true},
{ui::ET_KEY_PRESSED,
{ui::VKEY_4, ui::DomCode::DIGIT4, ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'4'>::Character},
{ui::VKEY_4, ui::DomCode::DIGIT4, ui::EF_COMMAND_DOWN,
- ui::DomKey::Constant<'4'>::Character}},
+ ui::DomKey::Constant<'4'>::Character},
+ kKeyboardDeviceId,
+ /*triggers_notification=*/true},
{ui::ET_KEY_PRESSED,
{ui::VKEY_5, ui::DomCode::DIGIT5, ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'5'>::Character},
{ui::VKEY_5, ui::DomCode::DIGIT5, ui::EF_COMMAND_DOWN,
- ui::DomKey::Constant<'5'>::Character}},
+ ui::DomKey::Constant<'5'>::Character},
+ kKeyboardDeviceId,
+ /*triggers_notification=*/true},
{ui::ET_KEY_PRESSED,
{ui::VKEY_6, ui::DomCode::DIGIT6, ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'6'>::Character},
{ui::VKEY_6, ui::DomCode::DIGIT6, ui::EF_COMMAND_DOWN,
- ui::DomKey::Constant<'6'>::Character}},
+ ui::DomKey::Constant<'6'>::Character},
+ kKeyboardDeviceId,
+ /*triggers_notification=*/true},
{ui::ET_KEY_PRESSED,
{ui::VKEY_7, ui::DomCode::DIGIT7, ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'7'>::Character},
{ui::VKEY_7, ui::DomCode::DIGIT7, ui::EF_COMMAND_DOWN,
- ui::DomKey::Constant<'7'>::Character}},
+ ui::DomKey::Constant<'7'>::Character},
+ kKeyboardDeviceId,
+ /*triggers_notification=*/true},
{ui::ET_KEY_PRESSED,
{ui::VKEY_8, ui::DomCode::DIGIT8, ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'8'>::Character},
{ui::VKEY_8, ui::DomCode::DIGIT8, ui::EF_COMMAND_DOWN,
- ui::DomKey::Constant<'8'>::Character}},
+ ui::DomKey::Constant<'8'>::Character},
+ kKeyboardDeviceId,
+ /*triggers_notification=*/true},
{ui::ET_KEY_PRESSED,
{ui::VKEY_9, ui::DomCode::DIGIT9, ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'9'>::Character},
{ui::VKEY_9, ui::DomCode::DIGIT9, ui::EF_COMMAND_DOWN,
- ui::DomKey::Constant<'9'>::Character}},
+ ui::DomKey::Constant<'9'>::Character},
+ kKeyboardDeviceId,
+ /*triggers_notification=*/true},
{ui::ET_KEY_PRESSED,
{ui::VKEY_0, ui::DomCode::DIGIT0, ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'0'>::Character},
{ui::VKEY_0, ui::DomCode::DIGIT0, ui::EF_COMMAND_DOWN,
- ui::DomKey::Constant<'0'>::Character}},
+ ui::DomKey::Constant<'0'>::Character},
+ kKeyboardDeviceId,
+ /*triggers_notification=*/true},
{ui::ET_KEY_PRESSED,
{ui::VKEY_OEM_MINUS, ui::DomCode::MINUS, ui::EF_COMMAND_DOWN,
ui::DomKey::Constant<'-'>::Character},
