Chromium Code Reviews| Index: ash/common/wm/overview/window_selector.cc |
| diff --git a/ash/common/wm/overview/window_selector.cc b/ash/common/wm/overview/window_selector.cc |
| index 03ed6fd9fb1a88084e5324c521498c672bde9757..43f98d7053654a94bd1527c09870581cc2ffd04a 100644 |
| --- a/ash/common/wm/overview/window_selector.cc |
| +++ b/ash/common/wm/overview/window_selector.cc |
| @@ -499,13 +499,24 @@ bool WindowSelector::HandleKeyEvent(views::Textfield* sender, |
| break; |
| case ui::VKEY_RIGHT: |
| case ui::VKEY_TAB: |
| - num_key_presses_++; |
| - Move(WindowSelector::RIGHT, true); |
| - break; |
| + if (!(key_event.flags() & ui::EF_SHIFT_DOWN) || |
| + (key_event.key_code() != ui::VKEY_TAB)) { |
|
tdanderson
2016/07/07 21:26:49
nit: I think this is slightly more readable: if (k
varkha
2016/07/08 00:00:13
Done.
|
| + num_key_presses_++; |
| + Move(WindowSelector::RIGHT, true); |
| + break; |
| + } |
| case ui::VKEY_LEFT: |
| num_key_presses_++; |
| Move(WindowSelector::LEFT, true); |
| break; |
| + case ui::VKEY_W: |
| + if (!(key_event.flags() & ui::EF_CONTROL_DOWN) || |
| + !grid_list_[selected_grid_index_]->is_selecting()) { |
| + // allow the textfield to handle 'W' key when not used with Ctrl. |
| + return false; |
| + } |
| + grid_list_[selected_grid_index_]->SelectedWindow()->CloseWindow(); |
| + break; |
| case ui::VKEY_RETURN: |
| // Ignore if no item is selected. |
| if (!grid_list_[selected_grid_index_]->is_selecting()) |