| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <set> | 6 #include <set> |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 1665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1676 | 1676 |
| 1677 // DesktopNativeWidget does not exist on non-Aura or on ChromeOS. | 1677 // DesktopNativeWidget does not exist on non-Aura or on ChromeOS. |
| 1678 #if !defined(OS_CHROMEOS) | 1678 #if !defined(OS_CHROMEOS) |
| 1679 TEST_F(WidgetWindowTitleTest, SetWindowTitleChanged_DesktopNativeWidget) { | 1679 TEST_F(WidgetWindowTitleTest, SetWindowTitleChanged_DesktopNativeWidget) { |
| 1680 // Override to use a DesktopNativeWidget. | 1680 // Override to use a DesktopNativeWidget. |
| 1681 bool desktop_native_widget = true; | 1681 bool desktop_native_widget = true; |
| 1682 RunTest(desktop_native_widget); | 1682 RunTest(desktop_native_widget); |
| 1683 } | 1683 } |
| 1684 #endif // !OS_CHROMEOS | 1684 #endif // !OS_CHROMEOS |
| 1685 | 1685 |
| 1686 // Used by SetTopLevelCorrectly to track calls to OnBeforeWidgetInit(). | |
| 1687 class VerifyTopLevelDelegate : public TestViewsDelegate { | |
| 1688 public: | |
| 1689 VerifyTopLevelDelegate() | |
| 1690 : on_before_init_called_(false), | |
| 1691 is_top_level_(false) { | |
| 1692 } | |
| 1693 | |
| 1694 bool on_before_init_called() const { return on_before_init_called_; } | |
| 1695 bool is_top_level() const { return is_top_level_; } | |
| 1696 | |
| 1697 virtual void OnBeforeWidgetInit( | |
| 1698 Widget::InitParams* params, | |
| 1699 internal::NativeWidgetDelegate* delegate) OVERRIDE { | |
| 1700 on_before_init_called_ = true; | |
| 1701 is_top_level_ = params->top_level; | |
| 1702 } | |
| 1703 | |
| 1704 private: | |
| 1705 bool on_before_init_called_; | |
| 1706 bool is_top_level_; | |
| 1707 | |
| 1708 DISALLOW_COPY_AND_ASSIGN(VerifyTopLevelDelegate); | |
| 1709 }; | |
| 1710 | |
| 1711 // Verifies |top_level| is correctly passed to | |
| 1712 // ViewsDelegate::OnBeforeWidgetInit(). | |
| 1713 TEST_F(WidgetTest, SetTopLevelCorrectly) { | |
| 1714 set_views_delegate(NULL); | |
| 1715 VerifyTopLevelDelegate* delegate = new VerifyTopLevelDelegate; | |
| 1716 set_views_delegate(delegate); // ViewsTestBase takes ownership. | |
| 1717 scoped_ptr<Widget> widget(new Widget); | |
| 1718 Widget::InitParams params = | |
| 1719 CreateParams(views::Widget::InitParams::TYPE_POPUP); | |
| 1720 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | |
| 1721 widget->Init(params); | |
| 1722 EXPECT_TRUE(delegate->on_before_init_called()); | |
| 1723 EXPECT_TRUE(delegate->is_top_level()); | |
| 1724 } | |
| 1725 | |
| 1726 TEST_F(WidgetTest, WidgetDeleted_InOnMousePressed) { | 1686 TEST_F(WidgetTest, WidgetDeleted_InOnMousePressed) { |
| 1727 Widget* widget = new Widget; | 1687 Widget* widget = new Widget; |
| 1728 Widget::InitParams params = | 1688 Widget::InitParams params = |
| 1729 CreateParams(views::Widget::InitParams::TYPE_POPUP); | 1689 CreateParams(views::Widget::InitParams::TYPE_POPUP); |
| 1730 widget->Init(params); | 1690 widget->Init(params); |
| 1731 | 1691 |
| 1732 widget->SetContentsView(new CloseWidgetView(ui::ET_MOUSE_PRESSED)); | 1692 widget->SetContentsView(new CloseWidgetView(ui::ET_MOUSE_PRESSED)); |
| 1733 | 1693 |
| 1734 widget->SetSize(gfx::Size(100, 100)); | 1694 widget->SetSize(gfx::Size(100, 100)); |
| 1735 widget->Show(); | 1695 widget->Show(); |
| (...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2463 child_widget.Init(child_params); | 2423 child_widget.Init(child_params); |
| 2464 child_widget.AddObserver(&observer); | 2424 child_widget.AddObserver(&observer); |
| 2465 child_widget.Show(); | 2425 child_widget.Show(); |
| 2466 | 2426 |
| 2467 parent_widget.CloseNow(); | 2427 parent_widget.CloseNow(); |
| 2468 } | 2428 } |
| 2469 #endif | 2429 #endif |
| 2470 | 2430 |
| 2471 } // namespace test | 2431 } // namespace test |
| 2472 } // namespace views | 2432 } // namespace views |
| OLD | NEW |