| 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 dd9fcde68d7f1d88ecb0ab80f3804db7705f253a..f5eb08f26b373bf02b559018a97ace7321c9597d 100644
|
| --- a/ash/wm/maximize_mode/maximize_mode_event_blocker.cc
|
| +++ b/ash/wm/maximize_mode/maximize_mode_event_blocker.cc
|
| @@ -63,7 +63,11 @@ ui::EventTarget* BlockKeyboardAndTouchpadTargeter::FindTargetForEvent(
|
| // (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) {
|
| + key_event->key_code() != ui::VKEY_VOLUME_UP
|
| +#if defined(OS_CHROMEOS)
|
| + && key_event->key_code() != ui::VKEY_POWER
|
| +#endif
|
| + ) {
|
| return NULL;
|
| }
|
| }
|
|
|