| Index: mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
|
| diff --git a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
|
| index 6c67dae02a24c048b77a448c25e3fc0c38a9f5be..15ad527c34718a75465285c97e4b43655991b30e 100644
|
| --- a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
|
| +++ b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
|
| @@ -277,6 +277,7 @@ class ViewManagerTest : public testing::Test {
|
| View* CreateViewInParent(View* parent) {
|
| ViewManager* parent_manager = ViewPrivate(parent).view_manager();
|
| View* view = View::Create(parent_manager);
|
| + view->SetVisible(true);
|
| parent->AddChild(view);
|
| return view;
|
| }
|
| @@ -348,6 +349,7 @@ TEST_F(ViewManagerTest, DISABLED_SetUp) {}
|
|
|
| TEST_F(ViewManagerTest, DISABLED_Embed) {
|
| View* view = View::Create(window_manager());
|
| + view->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view);
|
| ViewManager* embedded = Embed(window_manager(), view);
|
| EXPECT_TRUE(NULL != embedded);
|
| @@ -362,8 +364,10 @@ TEST_F(ViewManagerTest, DISABLED_Embed) {
|
| // TODO(sky): Update client lib to match server.
|
| TEST_F(ViewManagerTest, DISABLED_EmbeddedDoesntSeeChild) {
|
| View* view = View::Create(window_manager());
|
| + view->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view);
|
| View* nested = View::Create(window_manager());
|
| + nested->SetVisible(true);
|
| view->AddChild(nested);
|
|
|
| ViewManager* embedded = Embed(window_manager(), view);
|
| @@ -376,6 +380,7 @@ TEST_F(ViewManagerTest, DISABLED_EmbeddedDoesntSeeChild) {
|
| // http://crbug.com/396300
|
| TEST_F(ViewManagerTest, DISABLED_ViewManagerDestroyed_CleanupView) {
|
| View* view = View::Create(window_manager());
|
| + view->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view);
|
| ViewManager* embedded = Embed(window_manager(), view);
|
|
|
| @@ -406,6 +411,7 @@ TEST_F(ViewManagerTest, DISABLED_ViewManagerDestroyed_CleanupView) {
|
| // are reflected to another.
|
| TEST_F(ViewManagerTest, DISABLED_SetBounds) {
|
| View* view = View::Create(window_manager());
|
| + view->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view);
|
| ViewManager* embedded = Embed(window_manager(), view);
|
|
|
| @@ -424,6 +430,7 @@ TEST_F(ViewManagerTest, DISABLED_SetBounds) {
|
| // connection are refused.
|
| TEST_F(ViewManagerTest, DISABLED_SetBoundsSecurity) {
|
| View* view = View::Create(window_manager());
|
| + view->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view);
|
| ViewManager* embedded = Embed(window_manager(), view);
|
|
|
| @@ -444,6 +451,7 @@ TEST_F(ViewManagerTest, DISABLED_SetBoundsSecurity) {
|
| // Verifies that a view can only be destroyed by the connection that created it.
|
| TEST_F(ViewManagerTest, DISABLED_DestroySecurity) {
|
| View* view = View::Create(window_manager());
|
| + view->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view);
|
| ViewManager* embedded = Embed(window_manager(), view);
|
|
|
| @@ -461,8 +469,10 @@ TEST_F(ViewManagerTest, DISABLED_DestroySecurity) {
|
|
|
| TEST_F(ViewManagerTest, DISABLED_MultiRoots) {
|
| View* view1 = View::Create(window_manager());
|
| + view1->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view1);
|
| View* view2 = View::Create(window_manager());
|
| + view2->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view2);
|
| ViewManager* embedded1 = Embed(window_manager(), view1);
|
| ViewManager* embedded2 = Embed(window_manager(), view2);
|
| @@ -471,6 +481,7 @@ TEST_F(ViewManagerTest, DISABLED_MultiRoots) {
|
|
|
| TEST_F(ViewManagerTest, DISABLED_EmbeddingIdentity) {
|
| View* view = View::Create(window_manager());
|
| + view->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view);
|
| ViewManager* embedded = Embed(window_manager(), view);
|
| EXPECT_EQ(kWindowManagerURL, embedded->GetEmbedderURL());
|
| @@ -478,13 +489,16 @@ TEST_F(ViewManagerTest, DISABLED_EmbeddingIdentity) {
|
|
|
| TEST_F(ViewManagerTest, DISABLED_Reorder) {
|
| View* view1 = View::Create(window_manager());
|
| + view1->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view1);
|
|
|
| ViewManager* embedded = Embed(window_manager(), view1);
|
|
|
| View* view11 = View::Create(embedded);
|
| + view11->SetVisible(true);
|
| embedded->GetRoots().front()->AddChild(view11);
|
| View* view12 = View::Create(embedded);
|
| + view12->SetVisible(true);
|
| embedded->GetRoots().front()->AddChild(view12);
|
|
|
| View* view1_in_wm = window_manager()->GetViewById(view1->id());
|
| @@ -538,6 +552,7 @@ class VisibilityChangeObserver : public ViewObserver {
|
|
|
| TEST_F(ViewManagerTest, DISABLED_Visible) {
|
| View* view1 = View::Create(window_manager());
|
| + view1->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view1);
|
|
|
| // Embed another app and verify initial state.
|
| @@ -600,6 +615,7 @@ class DrawnChangeObserver : public ViewObserver {
|
|
|
| TEST_F(ViewManagerTest, DISABLED_Drawn) {
|
| View* view1 = View::Create(window_manager());
|
| + view1->SetVisible(true);
|
| window_manager()->GetRoots().front()->AddChild(view1);
|
|
|
| // Embed another app and verify initial state.
|
|
|