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

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

Issue 108063004: Give up focus if the focused view becomes unfocusable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Return early if not focused Created 6 years, 4 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 4808b4422cb1157310a4306bb74eb6c950fe1462..8cbb3c9852e75b553df58ed398f252f3f8b88c94 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -357,6 +357,21 @@ void FocusManager::ClearFocus() {
SetStoredFocusView(focused_view);
}
+void FocusManager::AdvanceFocusIfNecessary() {
+ // If widget is inactive, there is no focused view to check. The stored view
+ // will also be checked for focusability when it is being restored.
+ if (!widget_->IsActive())
+ return;
+
+ // If widget is active and focused view is not focusable, advance focus or,
+ // if not possible, clear focus.
+ if (focused_view_ && !focused_view_->IsAccessibilityFocusable()) {
+ AdvanceFocus(false);
+ if (focused_view_ && !focused_view_->IsAccessibilityFocusable())
+ ClearFocus();
+ }
+}
+
void FocusManager::StoreFocusedView(bool clear_native_focus) {
View* focused_view = focused_view_;
// Don't do anything if no focused view. Storing the view (which is NULL), in
« no previous file with comments | « ui/views/focus/focus_manager.h ('k') | ui/views/view.h » ('j') | ui/views/view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698