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

Unified Diff: ui/views/controls/native/native_view_host_aura_unittest.cc

Issue 2488393003: Changes views_aura_mus_unittests to create DesktopNativeWidgetAura (Closed)
Patch Set: remove this and fix mac 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
« no previous file with comments | « ui/views/controls/menu/menu_runner_unittest.cc ('k') | ui/views/event_monitor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/native/native_view_host_aura_unittest.cc
diff --git a/ui/views/controls/native/native_view_host_aura_unittest.cc b/ui/views/controls/native/native_view_host_aura_unittest.cc
index 40b5ce771a621b7ecb8b51d3e6ef7c7b9a5a7861..4169273259e8fa5cfac0639ca4461dbb6e95e848 100644
--- a/ui/views/controls/native/native_view_host_aura_unittest.cc
+++ b/ui/views/controls/native/native_view_host_aura_unittest.cc
@@ -269,7 +269,7 @@ TEST_F(NativeViewHostAuraTest, ParentAfterDetach) {
DestroyHost();
DestroyTopLevel();
- if (!IsMus()) {
+ if (!IsMus() && !IsAuraMusClient()) {
// The window is detached, so no longer associated with any Widget
// hierarchy. The root window still owns it, but the test harness checks
// for orphaned windows during TearDown().
@@ -277,9 +277,9 @@ TEST_F(NativeViewHostAuraTest, ParentAfterDetach) {
<< (*test_observer.events().begin()).type;
delete child_win;
} else {
- // In mus, the child window is still attached to the aura::WindowTreeHost
- // for the Widget. So destroying the toplevel Widget takes down the child
- // window with it.
+ // In mus and aura-mus, the child window is still attached to the
+ // aura::WindowTreeHost for the Widget. So destroying the toplevel Widget
+ // takes down the child window with it.
}
ASSERT_EQ(1u, test_observer.events().size());
« no previous file with comments | « ui/views/controls/menu/menu_runner_unittest.cc ('k') | ui/views/event_monitor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698