| 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 c37236e427ce7cb05f14b3bcf70e49b984a93b64..8df3011c319809023eae468491058c8a6762d6b7 100644
|
| --- a/ui/views/widget/widget_interactive_uitest.cc
|
| +++ b/ui/views/widget/widget_interactive_uitest.cc
|
| @@ -24,6 +24,7 @@
|
| #include "ui/views/touchui/touch_selection_controller_impl.h"
|
| #include "ui/views/widget/widget.h"
|
| #include "ui/views/window/dialog_delegate.h"
|
| +#include "ui/wm/core/default_screen_position_client.h"
|
| #include "ui/wm/public/activation_client.h"
|
|
|
| #if defined(OS_WIN)
|
| @@ -764,6 +765,7 @@ TEST_F(WidgetTestInteractive, TouchSelectionQuickMenuIsNotActivated) {
|
| views_delegate().set_use_desktop_native_widgets(true);
|
| #endif // !defined(OS_WIN)
|
|
|
| + wm::DefaultScreenPositionClient screen_position_client;
|
| Widget widget;
|
| Widget::InitParams init_params =
|
| CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
|
| @@ -780,6 +782,8 @@ TEST_F(WidgetTestInteractive, TouchSelectionQuickMenuIsNotActivated) {
|
| textfield->RequestFocus();
|
| textfield->SelectAll(true);
|
| TextfieldTestApi textfield_test_api(textfield);
|
| + aura::client::SetScreenPositionClient(widget.GetNativeView()->GetRootWindow(),
|
| + &screen_position_client);
|
|
|
| RunPendingMessages();
|
|
|
| @@ -792,6 +796,8 @@ TEST_F(WidgetTestInteractive, TouchSelectionQuickMenuIsNotActivated) {
|
| EXPECT_TRUE(widget.IsActive());
|
| EXPECT_TRUE(IsQuickMenuVisible(static_cast<TouchSelectionControllerImpl*>(
|
| textfield_test_api.touch_selection_controller())));
|
| + aura::client::SetScreenPositionClient(widget.GetNativeView()->GetRootWindow(),
|
| + nullptr);
|
| }
|
|
|
| TEST_F(WidgetTestInteractive, DisableViewDoesNotActivateWidget) {
|
|
|