| Index: ui/views/widget/widget_interactive_uitest.cc
|
| diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
|
| index 5221a57dfc1a3336ebe2d43179398e1ba4b8a240..4f8b370442a6fbfd446ce24aefb67623c015e83e 100644
|
| --- a/ui/views/widget/widget_interactive_uitest.cc
|
| +++ b/ui/views/widget/widget_interactive_uitest.cc
|
| @@ -998,10 +998,6 @@ TEST_F(WidgetTestInteractive, TouchSelectionQuickMenuIsNotActivated) {
|
| #endif // defined(USE_AURA)
|
|
|
| TEST_F(WidgetTestInteractive, DisableViewDoesNotActivateWidget) {
|
| - // TODO: see http://crbug.com/678070 for details.
|
| - if (IsMus())
|
| - return;
|
| -
|
| #if defined(OS_WIN)
|
| views_delegate()->set_use_desktop_native_widgets(true);
|
| #endif // !defined(OS_WIN)
|
| @@ -1017,6 +1013,7 @@ TEST_F(WidgetTestInteractive, DisableViewDoesNotActivateWidget) {
|
| view1->SetFocusBehavior(View::FocusBehavior::ALWAYS);
|
| widget1.GetRootView()->AddChildView(view1);
|
|
|
| + widget1.Show();
|
| ActivateSync(&widget1);
|
|
|
| FocusManager* focus_manager1 = widget1.GetFocusManager();
|
| @@ -1035,6 +1032,7 @@ TEST_F(WidgetTestInteractive, DisableViewDoesNotActivateWidget) {
|
| view2->SetFocusBehavior(View::FocusBehavior::ALWAYS);
|
| widget2.GetRootView()->AddChildView(view2);
|
|
|
| + widget2.Show();
|
| ActivateSync(&widget2);
|
| EXPECT_TRUE(widget2.IsActive());
|
| EXPECT_FALSE(widget1.IsActive());
|
|
|