Commit 4eff32a0 authored by erg's avatar erg Committed by Commit bot

view-mus: Fix DisableViewDoesNotActivateWidget by adding Show().

NWA was allowing invisible widgets to be activated, which
doesn't work in mus.

BUG=678070

Review-Url: https://codereview.chromium.org/2615743003
Cr-Commit-Position: refs/heads/master@{#442705}
parent af210b9f
...@@ -998,10 +998,6 @@ TEST_F(WidgetTestInteractive, TouchSelectionQuickMenuIsNotActivated) { ...@@ -998,10 +998,6 @@ TEST_F(WidgetTestInteractive, TouchSelectionQuickMenuIsNotActivated) {
#endif // defined(USE_AURA) #endif // defined(USE_AURA)
TEST_F(WidgetTestInteractive, DisableViewDoesNotActivateWidget) { TEST_F(WidgetTestInteractive, DisableViewDoesNotActivateWidget) {
// TODO: see http://crbug.com/678070 for details.
if (IsMus())
return;
#if defined(OS_WIN) #if defined(OS_WIN)
views_delegate()->set_use_desktop_native_widgets(true); views_delegate()->set_use_desktop_native_widgets(true);
#endif // !defined(OS_WIN) #endif // !defined(OS_WIN)
...@@ -1017,6 +1013,7 @@ TEST_F(WidgetTestInteractive, DisableViewDoesNotActivateWidget) { ...@@ -1017,6 +1013,7 @@ TEST_F(WidgetTestInteractive, DisableViewDoesNotActivateWidget) {
view1->SetFocusBehavior(View::FocusBehavior::ALWAYS); view1->SetFocusBehavior(View::FocusBehavior::ALWAYS);
widget1.GetRootView()->AddChildView(view1); widget1.GetRootView()->AddChildView(view1);
widget1.Show();
ActivateSync(&widget1); ActivateSync(&widget1);
FocusManager* focus_manager1 = widget1.GetFocusManager(); FocusManager* focus_manager1 = widget1.GetFocusManager();
...@@ -1035,6 +1032,7 @@ TEST_F(WidgetTestInteractive, DisableViewDoesNotActivateWidget) { ...@@ -1035,6 +1032,7 @@ TEST_F(WidgetTestInteractive, DisableViewDoesNotActivateWidget) {
view2->SetFocusBehavior(View::FocusBehavior::ALWAYS); view2->SetFocusBehavior(View::FocusBehavior::ALWAYS);
widget2.GetRootView()->AddChildView(view2); widget2.GetRootView()->AddChildView(view2);
widget2.Show();
ActivateSync(&widget2); ActivateSync(&widget2);
EXPECT_TRUE(widget2.IsActive()); EXPECT_TRUE(widget2.IsActive());
EXPECT_FALSE(widget1.IsActive()); EXPECT_FALSE(widget1.IsActive());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment