Desktop aura: Continue threading context through views.

These threads a .context parameter through most tests in views_unittests to widget creation (the handful that remain are Hard and will be addressed in a separate patch; I'm trying to keep these more manageable.) BUG=161882 Review URL: https://chromiumcodereview.appspot.com/11416251 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171196 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Dec 5, 2012 · 5209d23 · 5209d23
1 parent 678c036
commit 5209d23
Show file tree

Hide file tree

Showing 19 changed files with 208 additions and 132 deletions.
diff --git a/ui/views/accessible_pane_view_unittest.cc b/ui/views/accessible_pane_view_unittest.cc
@@ -71,8 +71,7 @@ View* TestBarView::GetDefaultFocusableChild() {
 TEST_F(AccessiblePaneViewTest, SimpleSetPaneFocus) {
   TestBarView* test_view = new TestBarView();
   scoped_ptr<Widget> widget(new Widget());
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget->Init(params);
   View* root = widget->GetRootView();
@@ -100,8 +99,7 @@ TEST_F(AccessiblePaneViewTest, TwoSetPaneFocus) {
   TestBarView* test_view = new TestBarView();
   TestBarView* test_view_2 = new TestBarView();
   scoped_ptr<Widget> widget(new Widget());
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget->Init(params);
   View* root = widget->GetRootView();
@@ -130,8 +128,7 @@ TEST_F(AccessiblePaneViewTest, PaneFocusTraversal) {
   TestBarView* test_view = new TestBarView();
   TestBarView* original_test_view = new TestBarView();
   scoped_ptr<Widget> widget(new Widget());
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget->Init(params);
   View* root = widget->GetRootView();

diff --git a/ui/views/bubble/bubble_delegate_unittest.cc b/ui/views/bubble/bubble_delegate_unittest.cc
@@ -43,7 +43,7 @@ void TestWidgetObserver::OnWidgetClosing(Widget* widget) {
 
 class TestBubbleDelegateView : public BubbleDelegateView {
  public:
-  TestBubbleDelegateView();
+  TestBubbleDelegateView(View* anchor_view);
   virtual ~TestBubbleDelegateView();
 
   virtual View* GetInitiallyFocusedView() OVERRIDE;
@@ -52,7 +52,9 @@ class TestBubbleDelegateView : public BubbleDelegateView {
   View* view_;
 };
 
-TestBubbleDelegateView::TestBubbleDelegateView() : view_(new View()) {
+TestBubbleDelegateView::TestBubbleDelegateView(View* anchor_view)
+    : BubbleDelegateView(anchor_view, BubbleBorder::TOP_LEFT),
+      view_(new View()) {
   view_->set_focusable(true);
   AddChildView(view_);
 }
@@ -68,8 +70,15 @@ View* TestBubbleDelegateView::GetInitiallyFocusedView() {
 typedef ViewsTestBase BubbleDelegateTest;
 
 TEST_F(BubbleDelegateTest, CreateDelegate) {
+  // Create the anchor and parent widgets.
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
+  scoped_ptr<Widget> anchor_widget(new Widget);
+  anchor_widget->Init(params);
+  anchor_widget->Show();
+
   BubbleDelegateView* bubble_delegate =
-      new BubbleDelegateView(NULL, BubbleBorder::NONE);
+      new BubbleDelegateView(anchor_widget->GetContentsView(),
+                             BubbleBorder::NONE);
   bubble_delegate->set_color(SK_ColorGREEN);
   Widget* bubble_widget(
       BubbleDelegateView::CreateBubble(bubble_delegate));
@@ -90,8 +99,7 @@ TEST_F(BubbleDelegateTest, CreateDelegate) {
 
 TEST_F(BubbleDelegateTest, CloseAnchorWidget) {
   // Create the anchor widget.
-  Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   scoped_ptr<Widget> anchor_widget(new Widget);
   anchor_widget->Init(params);
   anchor_widget->Show();
@@ -129,8 +137,7 @@ TEST_F(BubbleDelegateTest, CloseAnchorWidget) {
 
 TEST_F(BubbleDelegateTest, ResetAnchorWidget) {
   // Create the anchor and parent widgets.
-  Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   scoped_ptr<Widget> anchor_widget(new Widget);
   anchor_widget->Init(params);
   anchor_widget->Show();
@@ -183,7 +190,14 @@ TEST_F(BubbleDelegateTest, ResetAnchorWidget) {
 }
 
 TEST_F(BubbleDelegateTest, InitiallyFocusedView) {
-  TestBubbleDelegateView* bubble_delegate = new TestBubbleDelegateView();
+  // Create the anchor and parent widgets.
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
+  scoped_ptr<Widget> anchor_widget(new Widget);
+  anchor_widget->Init(params);
+  anchor_widget->Show();
+
+  TestBubbleDelegateView* bubble_delegate =
+      new TestBubbleDelegateView(anchor_widget->GetContentsView());
   Widget* bubble_widget = BubbleDelegateView::CreateBubble(bubble_delegate);
   bubble_widget->Show();
 

diff --git a/ui/views/bubble/bubble_frame_view_unittest.cc b/ui/views/bubble/bubble_frame_view_unittest.cc
@@ -24,7 +24,7 @@ const int kDefaultMargin = 6;
 
 class SizedBubbleDelegateView : public BubbleDelegateView {
  public:
-  SizedBubbleDelegateView();
+  SizedBubbleDelegateView(View* anchor_view);
   virtual ~SizedBubbleDelegateView();
 
   // View overrides:
@@ -34,7 +34,9 @@ class SizedBubbleDelegateView : public BubbleDelegateView {
   DISALLOW_COPY_AND_ASSIGN(SizedBubbleDelegateView);
 };
 
-SizedBubbleDelegateView::SizedBubbleDelegateView() {}
+SizedBubbleDelegateView::SizedBubbleDelegateView(View* anchor_view)
+    : BubbleDelegateView(anchor_view, BubbleBorder::TOP_LEFT) {
+}
 
 SizedBubbleDelegateView::~SizedBubbleDelegateView() {}
 
@@ -87,7 +89,14 @@ TEST_F(BubbleFrameViewTest, GetBoundsForClientView) {
 }
 
 TEST_F(BubbleFrameViewTest, NonClientHitTest) {
-  BubbleDelegateView* delegate = new SizedBubbleDelegateView();
+  // Create the anchor and parent widgets.
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
+  scoped_ptr<Widget> anchor_widget(new Widget);
+  anchor_widget->Init(params);
+  anchor_widget->Show();
+
+  BubbleDelegateView* delegate =
+      new SizedBubbleDelegateView(anchor_widget->GetContentsView());
   Widget* widget(BubbleDelegateView::CreateBubble(delegate));
   delegate->Show();
   gfx::Point kPtInBound(100, 100);

diff --git a/ui/views/controls/combobox/native_combobox_views_unittest.cc b/ui/views/controls/combobox/native_combobox_views_unittest.cc
@@ -102,7 +102,7 @@ class NativeComboboxViewsTest : public ViewsTestBase {
     combobox_->set_id(1);
 
     widget_ = new Widget;
-    Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
+    Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(100, 100, 100, 100);
     widget_->Init(params);
     View* container = new View();
@@ -180,7 +180,7 @@ TEST_F(NativeComboboxViewsTest, DisabilityTest) {
   ASSERT_FALSE(combobox_->GetNativeWrapperForTesting());
 
   widget_ = new Widget;
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.bounds = gfx::Rect(100, 100, 100, 100);
   widget_->Init(params);
   View* container = new View();

diff --git a/ui/views/controls/native/native_view_host_unittest.cc b/ui/views/controls/native/native_view_host_unittest.cc
@@ -78,8 +78,8 @@ HWND GetNativeParent(HWND window) {
 TEST_F(NativeViewHostTest, NativeViewHierarchyChanged) {
   // Create the top level widget.
   scoped_ptr<Widget> toplevel(new Widget);
-  Widget::InitParams toplevel_params(Widget::InitParams::TYPE_WINDOW);
-  toplevel_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams toplevel_params =
+      CreateParams(Widget::InitParams::TYPE_POPUP);
   toplevel->Init(toplevel_params);
   toplevel->SetContentsView(new View);
 

diff --git a/ui/views/controls/scrollbar/scrollbar_unittest.cc b/ui/views/controls/scrollbar/scrollbar_unittest.cc
@@ -64,7 +64,7 @@ class NativeScrollBarTest : public ViewsTestBase {
     native_scrollbar_->set_controller(controller_.get());
 
     widget_ = new Widget;
-    Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
+    Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(0, 0, 100, 100);
     widget_->Init(params);
     View* container = new View();

diff --git a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
@@ -55,8 +55,7 @@ class TabbedPaneTest : public ViewsTestBase {
 void TabbedPaneTest::SetUp() {
   ViewsTestBase::SetUp();
   widget_.reset(new Widget());
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.bounds = gfx::Rect(0, 0, 100, 100);
   widget_->Init(params);
   tabbed_pane_ = new TabbedPane();

diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc
@@ -161,7 +161,7 @@ class NativeTextfieldViewsTest : public ViewsTestBase,
     textfield_ = new TestTextfield(style);
     textfield_->SetController(this);
     widget_ = new Widget;
-    Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
+    Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(100, 100, 100, 100);
     widget_->Init(params);
     View* container = new View();

diff --git a/ui/views/focus/focus_manager_test.cc b/ui/views/focus/focus_manager_test.cc
@@ -30,8 +30,13 @@ FocusManager* FocusManagerTest::GetFocusManager() {
 
 void FocusManagerTest::SetUp() {
   ViewsTestBase::SetUp();
-  Widget* widget =
-      Widget::CreateWindowWithBounds(this, gfx::Rect(0, 0, 1024, 768));
+
+  Widget* widget = new Widget;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
+  params.delegate = this;
+  params.bounds = gfx::Rect(0, 0, 1024, 768);
+  widget->Init(params);
+
   InitContentView();
   widget->Show();
 }

diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
@@ -136,9 +136,7 @@ TEST_F(FocusManagerTest, WidgetFocusChangeListener) {
   TestWidgetFocusChangeListener widget_listener;
   AddWidgetFocusChangeListener(&widget_listener);
 
-  Widget::InitParams params;
-  params.type = views::Widget::InitParams::TYPE_WINDOW;
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(10, 10, 100, 100);
   params.parent_widget = GetWidget();
 

diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
@@ -9,6 +9,7 @@
 
 #if defined(USE_AURA)
 #include "ui/aura/env.h"
+#include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_helper.h"
 #endif
 
@@ -59,4 +60,14 @@ void ViewsTestBase::RunPendingMessages() {
   run_loop.RunUntilIdle();
 }
 
+Widget::InitParams ViewsTestBase::CreateParams(
+    Widget::InitParams::Type type) {
+  Widget::InitParams params(type);
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+#if defined(USE_AURA)
+  params.context = aura_test_helper_->root_window();
+#endif
+  return params;
+}
+
 }  // namespace views
diff --git a/ui/views/test/views_test_base.h b/ui/views/test/views_test_base.h
@@ -44,6 +44,11 @@ class ViewsTestBase : public testing::Test {
 
   MessageLoop* message_loop() { return &message_loop_; }
 
+  // Creates a widget of |type| with any platform specific data for use in
+  // cross-platform tests. Will also set WIDGET_OWNS_NATIVE_WIDGET, which most
+  // unit tests want.
+  Widget::InitParams CreateParams(Widget::InitParams::Type type);
+
  private:
   MessageLoopForUI message_loop_;
   scoped_ptr<TestViewsDelegate> views_delegate_;