ui/views/corewm/focus_controller.cc - Issue 14298013: Check focusability in WindowFocusedFromInputEvent

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/corewm/focus_controller.cc

Issue 14298013: Check focusability in WindowFocusedFromInputEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update FocusController tests 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:

Index: ui/views/corewm/focus_controller.cc

diff --git a/ui/views/corewm/focus_controller.cc b/ui/views/corewm/focus_controller.cc

index 1daba43ccef717480513e41273af4d8f42515a7f..eaab15101820708b88242137c2ffe4cd836e7915 100644

--- a/ui/views/corewm/focus_controller.cc

+++ b/ui/views/corewm/focus_controller.cc

@@ -336,7 +336,11 @@ void FocusController::WindowLostFocusFromDispositionChange(

}

void FocusController::WindowFocusedFromInputEvent(aura::Window* window) {

- FocusWindow(window);

+ // Only focus |window| if it or any of its parents can be focused. Otherwise

+ // FocusWindow() will focus the topmost window, which may not be the

+ // currently focused one.

+ if (rules_->CanFocusWindow(GetToplevelWindow(window)))

+ FocusWindow(window);

}

} // namespace corewm

« no previous file with comments | « ash/wm/window_manager_unittest.cc ('k') | ui/views/corewm/focus_controller_unittest.cc » ('j') | no next file with comments »