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..4d3d91ff5abaf34d277d76770905ce65fc8c0f2a 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.h" |
namespace ash { |
@@ -54,8 +55,19 @@ 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()) { |
+ // TODO(bruthig): Fix this to block volume events from the device's |
flackr
2014/04/30 14:27:44
To make this a bit more clear, how about "to block
bruthig
2014/04/30 15:36:16
Done.
|
+ // keboard. https://crbug.com/368669 |
flackr
2014/04/30 14:27:44
nit: s/keboard/keyboard
bruthig
2014/04/30 15:36:16
Done.
|
+ 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) { |
+ return NULL; |
+ } |
+ } |
+ } |
return default_targeter_->FindTargetForEvent(root, event); |
} |