ui/views/widget/native_widget_aura.cc - Issue 1753473003: A window should not get activated or get input focus if it's behind the lock screen.

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/widget/native_widget_aura.cc

Issue 1753473003: A window should not get activated or get input focus if it's behind the lock screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add test. Created 4 years, 10 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/widget/native_widget_aura.cc

diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc

index 85ab0aee9c0de3c74cd08d52dc8b9764d3a1a745..8c16994af4eb41f083a4347f02b8ad1186011328 100644

--- a/ui/views/widget/native_widget_aura.cc

+++ b/ui/views/widget/native_widget_aura.cc

@@ -489,7 +489,7 @@ void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {

window_->SetProperty(aura::client::kShowStateKey, state);

}

window_->Show();

- if (delegate_->CanActivate()) {

+ if (delegate_->CanActivate() && wm::CanActivateWindow(window_)) {

if (state != ui::SHOW_STATE_INACTIVE)

Activate();

// SetInitialFocus() should be always be called, even for

« ui/views/test/widget_test.h ('K') | « ui/views/test/widget_test.cc ('k') | ui/views/widget/widget_interactive_uitest.cc » ('j') | no next file with comments »