ui/views/mus/native_widget_mus.cc - Issue 1936823002: mus: Don't activate non-activatable widgets on Show()

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/mus/native_widget_mus.cc

Issue 1936823002: mus: Don't activate non-activatable widgets on Show() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 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/mus/native_widget_mus.cc

diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc

index 45b07ff1e59a67e70d17e61f686552691452a5c2..752e62b6d2e3dcecbad3f3b023a236d9287d7b7c 100644

--- a/ui/views/mus/native_widget_mus.cc

+++ b/ui/views/mus/native_widget_mus.cc

@@ -709,9 +709,11 @@ void NativeWidgetMus::ShowWithWindowState(ui::WindowShowState state) {

window_tree_host_->Show();

GetNativeWindow()->Show();

- if (state != ui::SHOW_STATE_INACTIVE)

- Activate();

- GetWidget()->SetInitialFocus(state);

+ if (native_widget_delegate_->CanActivate()) {

+ if (state != ui::SHOW_STATE_INACTIVE)

+ Activate();

+ GetWidget()->SetInitialFocus(state);

+ }

}

bool NativeWidgetMus::IsVisible() const {

« no previous file with comments | « no previous file | ui/views/mus/native_widget_mus_unittest.cc » ('j') | no next file with comments »