diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 21:02:59 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-07 21:02:59 +0000 |
| commit | 87b0d82e3a7323306b3a5b7c94a01226ab601254 (patch) | |
| tree | 54f9d25c8e9e71ba1fb2bdbbfad23d7e94f46190 /views/bubble/bubble_view_unittest.cc | |
| parent | 39944f52a7d6495574b27443f9d935a76c5d488a (diff) | |
| download | chromium_src-87b0d82e3a7323306b3a5b7c94a01226ab601254.zip chromium_src-87b0d82e3a7323306b3a5b7c94a01226ab601254.tar.gz chromium_src-87b0d82e3a7323306b3a5b7c94a01226ab601254.tar.bz2 | |
Changes the way windows are parented when their parent is set to NULL.. Adds a DesktopDelegate interface implemented by the aura client. The implementor handles parenting of windows when their parent is set to NULL, and also figures out how to activate windows.. Replaces Desktop::default_parent() with this. Requires adjusting some of the tests and adding a TestDesktopDelegate implementation that reconstructs what default_parent did.BUG=noneTEST=existing unit tests
Review URL: http://codereview.chromium.org/8194004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/bubble/bubble_view_unittest.cc')
| -rw-r--r-- | views/bubble/bubble_view_unittest.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/views/bubble/bubble_view_unittest.cc b/views/bubble/bubble_view_unittest.cc index d64fbb6..9fac7f4 100644 --- a/views/bubble/bubble_view_unittest.cc +++ b/views/bubble/bubble_view_unittest.cc @@ -9,12 +9,16 @@ #include "views/bubble/bubble_border.h" #include "views/bubble/bubble_delegate.h" #include "views/bubble/bubble_view.h" +#include "views/test/views_test_base.h" #include "views/widget/widget.h" namespace views { namespace { +typedef ViewsTestBase BubbleViewBasicTest; +typedef ViewsTestBase BubbleViewTest; + class TestBubbleDelegate : public BubbleDelegateView { public: explicit TestBubbleDelegate(Widget *frame): BubbleDelegateView(frame) {} @@ -42,8 +46,7 @@ class TestAnimationDelegate : public ui::AnimationDelegate { }; -TEST(BubbleViewBasicTest, CreateArrowBubble) { - MessageLoopForUI message_loop; +TEST_F(BubbleViewBasicTest, CreateArrowBubble) { scoped_ptr<Widget> bubble_widget(new Widget()); Widget::InitParams params(Widget::InitParams::TYPE_BUBBLE); TestBubbleDelegate delegate(bubble_widget.get()); @@ -57,14 +60,12 @@ TEST(BubbleViewBasicTest, CreateArrowBubble) { EXPECT_EQ(delegate.GetFrameArrowLocation(), border->arrow_location()); bubble_widget->CloseNow(); bubble_widget.reset(NULL); - MessageLoop::current()->RunAllPending(); + RunPendingMessages(); } } // namespace -TEST(BubbleViewTest, FadeAnimation) { - MessageLoopForUI message_loop; - +TEST_F(BubbleViewTest, FadeAnimation) { scoped_ptr<Widget> bubble_widget(new Widget()); Widget::InitParams params(Widget::InitParams::TYPE_BUBBLE); TestBubbleDelegate delegate(bubble_widget.get()); @@ -84,7 +85,7 @@ TEST(BubbleViewTest, FadeAnimation) { EXPECT_EQ(1, test_animation_delegate.animation_ended_); bubble_widget->CloseNow(); bubble_widget.reset(NULL); - MessageLoop::current()->RunAllPending(); + RunPendingMessages(); } } // namespace views |