summaryrefslogtreecommitdiffstats
path: root/ash/accelerators/accelerator_controller.cc
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-30 01:04:08 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-30 01:04:08 +0000
commit242aa4f94fa0bcc9558e17217c464cf5a98f790b (patch)
tree49c51ac5c88c2ead11294d9406dcb6026e50b6a3 /ash/accelerators/accelerator_controller.cc
parentda0ade73522ccbb0284cedf2764a68465f691dc5 (diff)
downloadchromium_src-242aa4f94fa0bcc9558e17217c464cf5a98f790b.zip
chromium_src-242aa4f94fa0bcc9558e17217c464cf5a98f790b.tar.gz
chromium_src-242aa4f94fa0bcc9558e17217c464cf5a98f790b.tar.bz2
Fix cycling of focusable panes in Chrome OS.
Update the ash window cycle controller so it can tell aura::Window to rotate pane focus and pass it the cycle direction, rather than just activating each window. The end result is that when you press Ctrl+Back and Ctrl+Forward you get a consistent cycle now, going through all panes within the most recently active browser window and then the launcher and status area. BUG=154598 Review URL: https://chromiumcodereview.appspot.com/13861032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller.cc')
-rw-r--r--ash/accelerators/accelerator_controller.cc19
1 files changed, 8 insertions, 11 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 19f3f3f..d813b41 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -121,17 +121,14 @@ bool HandleToggleSpokenFeedback() {
#endif // defined(OS_CHROMEOS)
bool HandleRotatePaneFocus(Shell::Direction direction) {
- if (!Shell::GetInstance()->delegate()->RotatePaneFocus(direction)) {
- // No browser window is available. Focus the launcher.
- Shell* shell = Shell::GetInstance();
- switch (direction) {
- case Shell::FORWARD:
- shell->focus_cycler()->RotateFocus(internal::FocusCycler::FORWARD);
- break;
- case Shell::BACKWARD:
- shell->focus_cycler()->RotateFocus(internal::FocusCycler::BACKWARD);
- break;
- }
+ Shell* shell = Shell::GetInstance();
+ switch (direction) {
+ case Shell::FORWARD:
+ shell->focus_cycler()->RotateFocus(internal::FocusCycler::FORWARD);
+ break;
+ case Shell::BACKWARD:
+ shell->focus_cycler()->RotateFocus(internal::FocusCycler::BACKWARD);
+ break;
}
return true;
}