Blocked volume up/down events that originated from remapped function keys.

chrome/browser/chromeos/events/event_rewriter.cc

Index: chrome/browser/chromeos/events/event_rewriter.cc
diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc
index 2603e0519400b43345afd263b049287000255c77..ec170f1b8d00d7a05e98287949e19bb012dd3e77 100644
--- a/chrome/browser/chromeos/events/event_rewriter.cc
+++ b/chrome/browser/chromeos/events/event_rewriter.cc
@@ -587,7 +587,6 @@ void EventRewriter::RewriteFunctionKeys(const ui::KeyEvent& key_event,
   CHECK(key_event.type() == ui::ET_KEY_PRESSED ||
         key_event.type() == ui::ET_KEY_RELEASED);
   MutableKeyState incoming = *state;
-  bool rewritten = false;
 
   if ((incoming.key_code >= ui::VKEY_F1) &&
       (incoming.key_code <= ui::VKEY_F24)) {
@@ -619,19 +618,16 @@ void EventRewriter::RewriteFunctionKeys(const ui::KeyEvent& key_event,
       };
       MutableKeyState incoming_without_command = incoming;
       incoming_without_command.flags &= ~ui::EF_COMMAND_DOWN;
-      rewritten =
-          RewriteWithKeyboardRemappingsByKeyCode(kFkeysToSystemKeys,
-                                                 arraysize(kFkeysToSystemKeys),
-                                                 incoming_without_command,
-                                                 state);
+      RewriteWithKeyboardRemappingsByKeyCode(kFkeysToSystemKeys,
+                                             arraysize(kFkeysToSystemKeys),
+                                             incoming_without_command,
+                                             state);
     } else if (search_is_pressed) {
       // Allow Search to avoid rewriting F1-F12.
       state->flags &= ~ui::EF_COMMAND_DOWN;
-      rewritten = true;
     }
-  }
-
-  if (!rewritten && (incoming.flags & ui::EF_COMMAND_DOWN)) {
+    state->flags |= ui::EF_FUNCTION_KEY;
+  } else if ((incoming.flags & ui::EF_COMMAND_DOWN)) {
     // Remap Search+<number> to F<number>.
     // We check the keycode here instead of the keysym, as these keys have
     // different keysyms when modifiers are pressed, such as shift.
@@ -652,7 +648,7 @@ void EventRewriter::RewriteFunctionKeys(const ui::KeyEvent& key_event,
         {ui::VKEY_0, ui::EF_COMMAND_DOWN, ui::VKEY_F10, 0},
         {ui::VKEY_OEM_MINUS, ui::EF_COMMAND_DOWN, ui::VKEY_F11, 0},
         {ui::VKEY_OEM_PLUS, ui::EF_COMMAND_DOWN, ui::VKEY_F12, 0}};
-    rewritten = RewriteWithKeyboardRemappingsByKeyCode(
+    RewriteWithKeyboardRemappingsByKeyCode(
         kNumberKeysToFkeys, arraysize(kNumberKeysToFkeys), incoming, state);
   }
 }