Chromium Code Reviews| 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 e283149b6fe66755d368efea094e209f45419b0c..2a93d0524375b08f4147f4c228e924db2fa34c0c 100644 |
| --- a/ash/wm/maximize_mode/maximize_mode_event_blocker.cc |
| +++ b/ash/wm/maximize_mode/maximize_mode_event_blocker.cc |
| @@ -8,6 +8,7 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "ui/aura/client/cursor_client.h" |
| #include "ui/events/event_targeter.h" |
| +#include "ui/events/keycodes/keyboard_codes_posix.h" |
| namespace ash { |
| @@ -54,8 +55,17 @@ void BlockKeyboardAndTouchpadTargeter::SetDefaultTargeter( |
| ui::EventTarget* BlockKeyboardAndTouchpadTargeter::FindTargetForEvent( |
| ui::EventTarget* root, |
| ui::Event* event) { |
| - if (event->HasNativeEvent() && (event->IsMouseEvent() || event->IsKeyEvent())) |
| - return NULL; |
| + if (event->HasNativeEvent()) { |
| + if (event->IsMouseEvent()) |
| + return NULL; |
| + if (event->IsKeyEvent()) { |
| + ui::KeyEvent* keyEvent = static_cast<ui::KeyEvent*>(event); |
| + if (keyEvent->key_code() != ui::VKEY_VOLUME_DOWN && |
| + keyEvent->key_code() != ui::VKEY_VOLUME_UP) { |
|
jonross
2014/04/29 17:32:09
Since this is a partial fix of the bug, add a todo
bruthig
2014/04/29 18:59:42
Done.
|
| + return NULL; |
| + } |
| + } |
| + } |
| return default_targeter_->FindTargetForEvent(root, event); |
| } |