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

3 files changed, 21 insertions, 17 deletions

diff --git a/views/bubble/bubble_delegate_unittest.cc b/views/bubble/bubble_delegate_unittest.cc
index c8a05e8..b7de55a 100644
--- a/views/bubble/bubble_delegate_unittest.cc
+++ b/views/bubble/bubble_delegate_unittest.cc
@@ -3,19 +3,21 @@
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/animation/slide_animation.h"
 #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 BubbleDelegateTest;
+
 class TestBubbleDelegate : public BubbleDelegateView {
  public:
   explicit TestBubbleDelegate(Widget *frame): BubbleDelegateView(frame) {}
@@ -29,8 +31,7 @@ class TestBubbleDelegate : public BubbleDelegateView {
   View view_;
 };
 
-TEST(BubbleDelegateTest, CreateDelegate) {
-  MessageLoopForUI message_loop;
+TEST_F(BubbleDelegateTest, CreateDelegate) {
   scoped_ptr<Widget> bubble_widget(new Widget());
   Widget::InitParams params(Widget::InitParams::TYPE_BUBBLE);
   TestBubbleDelegate delegate(bubble_widget.get());
@@ -41,7 +42,7 @@ TEST(BubbleDelegateTest, CreateDelegate) {
   EXPECT_EQ(bubble_widget, delegate.GetWidget());
   bubble_widget->CloseNow();
   bubble_widget.reset(NULL);
-  MessageLoop::current()->RunAllPending();
+  RunPendingMessages();
 }
 
 }  // namespace
diff --git a/views/bubble/bubble_frame_view_unittest.cc b/views/bubble/bubble_frame_view_unittest.cc
index b7153bd..d5cd874 100644
--- a/views/bubble/bubble_frame_view_unittest.cc
+++ b/views/bubble/bubble_frame_view_unittest.cc
@@ -9,20 +9,23 @@
 #include "views/bubble/bubble_border.h"
 #include "views/bubble/bubble_frame_view.h"
 #include "views/bubble/bubble_delegate.h"
+#include "views/test/views_test_base.h"
 #include "views/widget/widget.h"
 #if !defined(OS_WIN)
 #include "views/window/hit_test.h"
 #endif
+
 namespace views {
 
 namespace {
 
+typedef ViewsTestBase BubbleFrameViewBasicTest;
+
 gfx::Rect kBound = gfx::Rect(10, 10, 200, 200);
 SkColor kBackgroundColor = SK_ColorRED;
 BubbleBorder::ArrowLocation kArrow =  BubbleBorder::LEFT_BOTTOM;
 
-TEST(BubbleFrameViewBasicTest, GetBoundsForClientView) {
-  MessageLoopForUI message_loop;
+TEST_F(BubbleFrameViewBasicTest, GetBoundsForClientView) {
   scoped_ptr<Widget> widget(new views::Widget());
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_BUBBLE);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
@@ -40,7 +43,7 @@ TEST(BubbleFrameViewBasicTest, GetBoundsForClientView) {
   EXPECT_EQ(expected_insets.top(), frame.GetBoundsForClientView().y());
   widget->CloseNow();
   widget.reset(NULL);
-  MessageLoop::current()->RunAllPending();
+  RunPendingMessages();
 }
 
 class TestBubbleDelegate : public BubbleDelegateView {
@@ -54,8 +57,7 @@ class TestBubbleDelegate : public BubbleDelegateView {
   View view_;
 };
 
-TEST(BubbleFrameViewBasicTest, NonClientHitTest) {
-  MessageLoopForUI message_loop;
+TEST_F(BubbleFrameViewBasicTest, NonClientHitTest) {
   scoped_ptr<Widget> widget(new Widget());
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_BUBBLE);
   TestBubbleDelegate delegate(widget.get());
@@ -69,7 +71,7 @@ TEST(BubbleFrameViewBasicTest, NonClientHitTest) {
             widget->non_client_view()->NonClientHitTest(kPtOutsideBound));
   widget->CloseNow();
   widget.reset(NULL);
-  MessageLoop::current()->RunAllPending();
+  RunPendingMessages();
 }
 
 }  // namespace
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