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

ash/wm/maximize_mode/maximize_mode_event_blocker.cc

Index: ash/wm/maximize_mode/maximize_mode_event_blocker.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_event_blocker.cc b/ash/wm/maximize_mode/maximize_mode_event_blocker.cc
index 572886c1e0f8db6e10a02d9b8ddbc934e1518c08..b75ca267596b619e6e9b406962d8c78b786db827 100644
--- a/ash/wm/maximize_mode/maximize_mode_event_blocker.cc
+++ b/ash/wm/maximize_mode/maximize_mode_event_blocker.cc
@@ -105,15 +105,15 @@ ui::EventTarget* BlockKeyboardAndTouchpadTargeter::FindTargetForEvent(
     // when we begin using XI2 events for keyboard events
     // (http://crbug.com/368750) and can tell which device the event is
     // coming from, http://crbug.com/362881.
-    // TODO(bruthig): Fix this to block rewritten volume keys
-    // (i.e. F9 and F10)  from the device's keyboard. https://crbug.com/368669
     ui::KeyEvent* key_event = static_cast<ui::KeyEvent*>(event);
-    if (key_event->key_code() != ui::VKEY_VOLUME_DOWN &&
-        key_event->key_code() != ui::VKEY_VOLUME_UP
+    if ((key_event->flags() & ui::EF_FUNCTION_KEY) |

[jonross, 2014/05/26 13:55:41]

nit: if not doing bit-wise math, use the short-circuit or: ||

[bruthig, 2014/05/26 14:17:45]

Done.

+        (key_event->key_code() != ui::VKEY_VOLUME_DOWN &&
+         key_event->key_code() != ui::VKEY_VOLUME_UP
 #if defined(OS_CHROMEOS)
-      && key_event->key_code() != ui::VKEY_POWER
+         && key_event->key_code() != ui::VKEY_POWER
 #endif
-        ) {
+        )
+       ) {
       return NULL;
     }
   }