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

ash/wm/maximize_mode/maximize_mode_event_blocker.cc

 // Copyright 2014 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/wm/maximize_mode/maximize_mode_event_blocker.h"
 
 #include "ash/shell.h"
 #include "ash/wm/maximize_mode/internal_input_device_list.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 87 matching lines @@
       root_window_->GetHost()->ConvertPointToHost(&last_mouse_location_);
     }
   } else if (internal_device && (event->IsMouseWheelEvent() ||
                                  event->IsScrollEvent())) {
     return NULL;
   } else if (event->IsKeyEvent() && event->HasNativeEvent()) {
     // TODO(flackr): Disable events only from the internal keyboard device
     // 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) ||
+        (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;
     }
   }
   return default_targeter_->FindTargetForEvent(root, event);
 }
 
 }  // namespace
 
 MaximizeModeEventBlocker::MaximizeModeEventBlocker()
 #if defined(USE_X11)
@@ skipping 29 matching lines @@
     aura::Window* root_window) {
   BlockKeyboardAndTouchpadTargeter* targeter =
       new BlockKeyboardAndTouchpadTargeter(root_window, this);
   aura::ScopedWindowTargeter* scoped_targeter = new aura::ScopedWindowTargeter(
       root_window, scoped_ptr<ui::EventTargeter>(targeter));
   targeter->SetDefaultTargeter(scoped_targeter->old_targeter());
   targeters_.push_back(scoped_targeter);
 }
 
 }  // namespace ash