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

Unified Diff: ui/views/focus/focus_manager.cc

Issue 14827004: cros: Arrow key traversal in views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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: ui/views/focus/focus_manager.cc
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index d5b652535573ffea7df31cc15e4e166b9fb9f479..e46d725d52c9a15df0537f4138be194c7c40be5a 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -5,6 +5,7 @@
#include "ui/views/focus/focus_manager.h"
#include <algorithm>
+#include <vector>
#include "base/auto_reset.h"
#include "base/logging.h"
@@ -24,6 +25,7 @@
namespace views {
bool FocusManager::shortcut_handling_suspended_ = false;
+bool FocusManager::arrow_key_traversal_enabled_ = false;
FocusManager::FocusManager(Widget* widget, FocusManagerDelegate* delegate)
: widget_(widget),
@@ -87,6 +89,9 @@ bool FocusManager::OnKeyEvent(const ui::KeyEvent& event) {
}
#endif
+ if (arrow_key_traversal_enabled_ && ProcessArrowKeyTraversal(event))
+ return false;
+
// Intercept arrow key messages to switch between grouped views.
if (focused_view_ && focused_view_->GetGroup() != -1 &&
(key_code == ui::VKEY_UP || key_code == ui::VKEY_DOWN ||
@@ -516,4 +521,21 @@ void FocusManager::RemoveFocusChangeListener(FocusChangeListener* listener) {
focus_change_listeners_.RemoveObserver(listener);
}
+bool FocusManager::ProcessArrowKeyTraversal(const ui::KeyEvent& event) {
+ if (event.IsShiftDown() || event.IsControlDown() || event.IsAltDown())
+ return false;
+
+ const int key_code = event.key_code();
+ if (key_code == ui::VKEY_LEFT || key_code == ui::VKEY_UP) {
+ AdvanceFocus(true);
+ return true;
+ }
+ if (key_code == ui::VKEY_RIGHT || key_code == ui::VKEY_DOWN) {
+ AdvanceFocus(false);
+ return true;
+ }
+
+ return false;
+}
+
} // namespace views

Powered by Google App Engine
This is Rietveld 408576698