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

Unified Diff: ui/views/widget/widget_unittest.cc

Issue 2628373002: MacViews: Support MODAL_TYPE_WINDOW in dialog tests. (Closed)
Patch Set: rebase Created 3 years, 11 months 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/widget/native_widget_mac_unittest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/widget_unittest.cc
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index f3686be53dcbad68271f27aa3e981858dd16fca5..52845e5ed925fc9141065f1f52e2ac2e7a8ccfc2 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -2977,11 +2977,24 @@ TEST_F(WidgetTest, GetAllChildWidgets) {
expected.insert(w21);
expected.insert(w22);
- std::set<Widget*> widgets;
- Widget::GetAllChildWidgets(toplevel->GetNativeView(), &widgets);
+ std::set<Widget*> child_widgets;
+ Widget::GetAllChildWidgets(toplevel->GetNativeView(), &child_widgets);
- EXPECT_EQ(expected.size(), widgets.size());
- EXPECT_TRUE(std::equal(expected.begin(), expected.end(), widgets.begin()));
+ EXPECT_EQ(expected.size(), child_widgets.size());
+ EXPECT_TRUE(
+ std::equal(expected.begin(), expected.end(), child_widgets.begin()));
+
+ // Check GetAllOwnedWidgets(). On Aura, this includes "transient" children.
+ // Otherwise (on all platforms), it should be the same as GetAllChildWidgets()
+ // except the root Widget is not included.
+ EXPECT_EQ(1u, expected.erase(toplevel.get()));
+
+ std::set<Widget*> owned_widgets;
+ Widget::GetAllOwnedWidgets(toplevel->GetNativeView(), &owned_widgets);
+
+ EXPECT_EQ(expected.size(), owned_widgets.size());
+ EXPECT_TRUE(
+ std::equal(expected.begin(), expected.end(), owned_widgets.begin()));
}
// Used by DestroyChildWidgetsInOrder. On destruction adds the supplied name to
« no previous file with comments | « ui/views/widget/native_widget_mac_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698