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

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

Issue 564553002: When we switch tabs in chrome, the tab being switched away from gets hidden/shown/hidden. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NULL root window check Created 6 years, 3 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
Index: ui/views/controls/native/native_view_host_unittest.cc
diff --git a/ui/views/controls/native/native_view_host_unittest.cc b/ui/views/controls/native/native_view_host_unittest.cc
index e77fd358bf5827b987f1649eb50e93d9143ffd80..33743129d42fce06cf4c868e4ffbc3d00b6555a8 100644
--- a/ui/views/controls/native/native_view_host_unittest.cc
+++ b/ui/views/controls/native/native_view_host_unittest.cc
@@ -147,13 +147,10 @@ TEST_F(NativeViewHostTest, NativeViewHierarchyChanged) {
// Detaching should send a NativeViewHierarchyChanged() notification and
// change the parent.
host->Detach();
-#if defined(USE_AURA)
- // Two notifications are generated from removing the native view from the
- // clipping window and then reparenting it to the root window.
- EXPECT_EQ(2, test_view->notification_count());
-#else
+ // One notification is generated from reparenting the native view to the root
+ // window.
EXPECT_EQ(1, test_view->notification_count());
-#endif
+
EXPECT_NE(toplevel()->GetNativeView(),
GetNativeParent(child->GetNativeView()));
test_view->ResetCount();

Powered by Google App Engine
This is Rietveld 408576698