Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(987)

Unified Diff: ash/wm/overview/window_selector.cc

Issue 324493004: Fix pressing enter key crashes overview mode without a selection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Rob's comments, test failing. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/overview/window_selector.cc
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc
index 593df59c90ee8f3cb18a5b5baa01c0e1b8a923b2..8d69738790c909135a533dfc9d0fea10bc569e4a 100644
--- a/ash/wm/overview/window_selector.cc
+++ b/ash/wm/overview/window_selector.cc
@@ -200,7 +200,6 @@ void WindowSelector::OnKeyEvent(ui::KeyEvent* event) {
if (event->type() != ui::ET_KEY_PRESSED)
return;
- bool handled = true;
switch (event->key_code()) {
case ui::VKEY_ESCAPE:
CancelSelection();
@@ -218,17 +217,17 @@ void WindowSelector::OnKeyEvent(ui::KeyEvent* event) {
Move(WindowSelector::LEFT);
break;
case ui::VKEY_RETURN:
- wm::GetWindowState(
- grid_list_[selected_grid_index_]->
- SelectedWindow()->SelectionWindow())->Activate();
+ // Ignore if no item is selected.
+ if (!grid_list_[selected_grid_index_]->is_selecting())
+ return;
+ wm::GetWindowState(grid_list_[selected_grid_index_]->
+ SelectedWindow()->SelectionWindow())->Activate();
break;
default:
// Not a key we are interested in.
- handled = false;
- break;
+ return;
}
- if (handled)
- event->SetHandled();
+ event->StopPropagation();
}
void WindowSelector::OnDisplayAdded(const gfx::Display& display) {
« no previous file with comments | « no previous file | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698