Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1674)

Unified Diff: ui/views/touchui/touch_selection_menu_runner_views_unittest.cc

Issue 2489513003: Fixes and test updates for aura-mus (Closed)
Patch Set: Created 4 years, 1 month 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/touchui/touch_selection_menu_runner_views_unittest.cc
diff --git a/ui/views/touchui/touch_selection_menu_runner_views_unittest.cc b/ui/views/touchui/touch_selection_menu_runner_views_unittest.cc
index 9a557b22e7ed5b2134944c1a51117dbf31bcac56..34ea2b22a9712f9929a85a4872ffd3a804d70ad6 100644
--- a/ui/views/touchui/touch_selection_menu_runner_views_unittest.cc
+++ b/ui/views/touchui/touch_selection_menu_runner_views_unittest.cc
@@ -30,6 +30,17 @@ class TouchSelectionMenuRunnerViewsTest : public ViewsTestBase,
~TouchSelectionMenuRunnerViewsTest() override {}
protected:
+ void SetUp() override {
+ ViewsTestBase::SetUp();
+ // These tests expect NativeWidgetAura, force it's creation.
msw 2016/11/08 23:38:27 nit: "its"
sky 2016/11/09 00:06:01 Done.
+ // TODO(sky): the reason these end up using NativeWidgetAura is because they
msw 2016/11/08 23:38:27 optional nit: cite a bug?
sky 2016/11/09 00:06:01 Done.
+ // create a widget parented to GetContext(). GetContext() currently always
+ // returns an aura::Window in a fake WindowTreeHost. For aura-mus we should
+ // not create a fake WindowTreeHost.
+ ViewsDelegate::GetInstance()->set_native_widget_factory(
+ ViewsDelegate::NativeWidgetFactory());
+ }
+
void set_no_commmand_available(bool no_command) {
no_command_available_ = no_command;
}

Powered by Google App Engine
This is Rietveld 408576698