| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 9 #include "ui/views/test/test_views_delegate.h" | 9 #include "ui/views/test/test_views_delegate.h" |
| 10 #include "ui/views/test/views_test_base.h" | 10 #include "ui/views/test/views_test_base.h" |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 547 widget->Init(params); | 547 widget->Init(params); |
| 548 | 548 |
| 549 // Now destroy the native widget. | 549 // Now destroy the native widget. |
| 550 widget->CloseNow(); | 550 widget->CloseNow(); |
| 551 | 551 |
| 552 EXPECT_TRUE(state.widget_deleted); | 552 EXPECT_TRUE(state.widget_deleted); |
| 553 EXPECT_TRUE(state.native_widget_deleted); | 553 EXPECT_TRUE(state.native_widget_deleted); |
| 554 } | 554 } |
| 555 | 555 |
| 556 // NativeWidget owns its Widget, part 2: NativeWidget is a NativeWidget. | 556 // NativeWidget owns its Widget, part 2: NativeWidget is a NativeWidget. |
| 557 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) |
| 558 // Temporarily disable the test (http://crbug.com/104945). |
| 559 TEST_F(WidgetOwnershipTest, DISABLED_Ownership_ViewsNativeWidgetOwnsWidget) { |
| 560 #else |
| 557 TEST_F(WidgetOwnershipTest, Ownership_ViewsNativeWidgetOwnsWidget) { | 561 TEST_F(WidgetOwnershipTest, Ownership_ViewsNativeWidgetOwnsWidget) { |
| 562 #endif |
| 558 OwnershipTestState state; | 563 OwnershipTestState state; |
| 559 | 564 |
| 560 Widget* toplevel = CreateTopLevelPlatformWidget(); | 565 Widget* toplevel = CreateTopLevelPlatformWidget(); |
| 561 | 566 |
| 562 Widget* widget = new OwnershipTestWidget(&state); | 567 Widget* widget = new OwnershipTestWidget(&state); |
| 563 Widget::InitParams params(Widget::InitParams::TYPE_POPUP); | 568 Widget::InitParams params(Widget::InitParams::TYPE_POPUP); |
| 564 params.native_widget = | 569 params.native_widget = |
| 565 new OwnershipTestNativeWidgetPlatform(widget, &state); | 570 new OwnershipTestNativeWidgetPlatform(widget, &state); |
| 566 params.parent_widget = toplevel; | 571 params.parent_widget = toplevel; |
| 567 widget->Init(params); | 572 widget->Init(params); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 597 #elif defined(TOOLKIT_USES_GTK) | 602 #elif defined(TOOLKIT_USES_GTK) |
| 598 gtk_widget_destroy(widget->GetNativeView()); | 603 gtk_widget_destroy(widget->GetNativeView()); |
| 599 #endif | 604 #endif |
| 600 | 605 |
| 601 EXPECT_TRUE(state.widget_deleted); | 606 EXPECT_TRUE(state.widget_deleted); |
| 602 EXPECT_TRUE(state.native_widget_deleted); | 607 EXPECT_TRUE(state.native_widget_deleted); |
| 603 } | 608 } |
| 604 | 609 |
| 605 // NativeWidget owns its Widget, part 4: NativeWidget is a NativeWidget, | 610 // NativeWidget owns its Widget, part 4: NativeWidget is a NativeWidget, |
| 606 // destroyed by the view hierarchy that contains it. | 611 // destroyed by the view hierarchy that contains it. |
| 612 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) |
| 613 // Temporarily disable the test (http://crbug.com/104945). |
| 614 TEST_F(WidgetOwnershipTest, |
| 615 DISABLED_Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy) { |
| 616 #else |
| 607 TEST_F(WidgetOwnershipTest, | 617 TEST_F(WidgetOwnershipTest, |
| 608 Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy) { | 618 Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy) { |
| 619 #endif |
| 609 OwnershipTestState state; | 620 OwnershipTestState state; |
| 610 | 621 |
| 611 Widget* toplevel = CreateTopLevelPlatformWidget(); | 622 Widget* toplevel = CreateTopLevelPlatformWidget(); |
| 612 | 623 |
| 613 Widget* widget = new OwnershipTestWidget(&state); | 624 Widget* widget = new OwnershipTestWidget(&state); |
| 614 Widget::InitParams params(Widget::InitParams::TYPE_POPUP); | 625 Widget::InitParams params(Widget::InitParams::TYPE_POPUP); |
| 615 params.native_widget = | 626 params.native_widget = |
| 616 new OwnershipTestNativeWidgetPlatform(widget, &state); | 627 new OwnershipTestNativeWidgetPlatform(widget, &state); |
| 617 params.parent_widget = toplevel; | 628 params.parent_widget = toplevel; |
| 618 widget->Init(params); | 629 widget->Init(params); |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 809 RunPendingMessages(); | 820 RunPendingMessages(); |
| 810 EXPECT_NE(toplevel->GetWindowScreenBounds().ToString(), | 821 EXPECT_NE(toplevel->GetWindowScreenBounds().ToString(), |
| 811 toplevel->GetRestoredBounds().ToString()); | 822 toplevel->GetRestoredBounds().ToString()); |
| 812 EXPECT_GT(toplevel->GetRestoredBounds().width(), 0); | 823 EXPECT_GT(toplevel->GetRestoredBounds().width(), 0); |
| 813 EXPECT_GT(toplevel->GetRestoredBounds().height(), 0); | 824 EXPECT_GT(toplevel->GetRestoredBounds().height(), 0); |
| 814 } | 825 } |
| 815 #endif | 826 #endif |
| 816 | 827 |
| 817 } // namespace | 828 } // namespace |
| 818 } // namespace views | 829 } // namespace views |
| OLD | NEW |