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

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: Added unittest 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
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..a5a1ce9fc65a5b7a60c1034b003fa5e261a6ed08 100644
--- a/ash/wm/overview/window_selector.cc
+++ b/ash/wm/overview/window_selector.cc
@@ -218,9 +218,10 @@ void WindowSelector::OnKeyEvent(ui::KeyEvent* event) {
Move(WindowSelector::LEFT);
break;
case ui::VKEY_RETURN:
- wm::GetWindowState(
- grid_list_[selected_grid_index_]->
- SelectedWindow()->SelectionWindow())->Activate();
+ if (grid_list_[selected_grid_index_]->is_selecting()) {
tdanderson 2014/06/06 21:15:17 A short comment would be nice to say something lik
Nina 2014/06/06 21:44:32 Done.
+ wm::GetWindowState(grid_list_[selected_grid_index_]->
+ SelectedWindow()->SelectionWindow())->Activate();
+ }
tdanderson 2014/06/06 21:15:17 I think you will want to set handled = false; in t
Nina 2014/06/06 21:44:32 Done.
break;
default:
// Not a key we are interested in.
« no previous file with comments | « no previous file | ash/wm/overview/window_selector_unittest.cc » ('j') | ash/wm/overview/window_selector_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698