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

Unified Diff: ash/wm/window_cycle_event_filter_aura.cc

Issue 2612633002: CrOS Alt+Tab UI: no-op when UI is aborted (instead of switching window). (Closed)
Patch Set: Created 3 years, 12 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/window_cycle_event_filter_aura.cc
diff --git a/ash/wm/window_cycle_event_filter_aura.cc b/ash/wm/window_cycle_event_filter_aura.cc
index fbafa859b4bd3062689cf05afdcf48e6e7a6edd1..e9879b524f7005f9be2261aba4139640fdcb0daa 100644
--- a/ash/wm/window_cycle_event_filter_aura.cc
+++ b/ash/wm/window_cycle_event_filter_aura.cc
@@ -5,6 +5,7 @@
#include "ash/wm/window_cycle_event_filter_aura.h"
#include "ash/common/wm/window_cycle_controller.h"
+#include "ash/common/wm/window_cycle_list.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ui/events/event.h"
@@ -30,7 +31,7 @@ void WindowCycleEventFilterAura::OnKeyEvent(ui::KeyEvent* event) {
// Views uses VKEY_MENU for both left and right Alt keys.
if (event->key_code() == ui::VKEY_MENU &&
event->type() == ui::ET_KEY_RELEASED) {
- WmShell::Get()->window_cycle_controller()->StopCycling();
+ WmShell::Get()->window_cycle_controller()->CompleteCycling();
// Warning: |this| will be deleted from here on.
} else if (event->key_code() == ui::VKEY_TAB) {
if (event->type() == ui::ET_KEY_RELEASED) {
@@ -46,7 +47,7 @@ void WindowCycleEventFilterAura::OnKeyEvent(ui::KeyEvent* event) {
: WindowCycleController::FORWARD));
}
} else if (event->key_code() == ui::VKEY_ESCAPE) {
- WmShell::Get()->window_cycle_controller()->StopCycling();
+ WmShell::Get()->window_cycle_controller()->CancelCycling();
}
}
« ash/common/wm/window_cycle_list.cc ('K') | « ash/wm/window_cycle_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698