Desktop aura: Continue threading context through views.

ui/views/widget/widget_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/native_widget_types.h"
@@ skipping 119 matching lines @@
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
     if (event->type() == ui::ET_GESTURE_BEGIN) {
       GetWidget()->SetCapture(this);
       event->StopPropagation();
     }
   }
 
   DISALLOW_COPY_AND_ASSIGN(GestureCaptureView);
 };
 
-typedef ViewsTestBase WidgetTest;
+class WidgetTest : public ViewsTestBase {
+ public:
+  WidgetTest() {}
+  virtual ~WidgetTest() {}
 
-NativeWidget* CreatePlatformNativeWidget(
-    internal::NativeWidgetDelegate* delegate) {
-  return new NativeWidgetPlatformForTest(delegate);
-}
+  NativeWidget* CreatePlatformNativeWidget(
+      internal::NativeWidgetDelegate* delegate) {
+    return new NativeWidgetPlatformForTest(delegate);
+  }
 
-Widget* CreateTopLevelPlatformWidget() {
-  Widget* toplevel = new Widget;
-  Widget::InitParams toplevel_params(Widget::InitParams::TYPE_WINDOW);
-  toplevel_params.native_widget = CreatePlatformNativeWidget(toplevel);
-  toplevel->Init(toplevel_params);
-  return toplevel;
-}
+  Widget* CreateTopLevelPlatformWidget() {
+    Widget* toplevel = new Widget;
+    Widget::InitParams toplevel_params =
+        CreateParams(Widget::InitParams::TYPE_WINDOW);
+    toplevel_params.native_widget = CreatePlatformNativeWidget(toplevel);
+    toplevel->Init(toplevel_params);
+    return toplevel;
+  }
 
-Widget* CreateChildPlatformWidget(gfx::NativeView parent_native_view) {
-  Widget* child = new Widget;
-  Widget::InitParams child_params(Widget::InitParams::TYPE_CONTROL);
-  child_params.native_widget = CreatePlatformNativeWidget(child);
-  child_params.parent = parent_native_view;
-  child->Init(child_params);
-  child->SetContentsView(new View);
-  return child;
-}
+  Widget* CreateChildPlatformWidget(gfx::NativeView parent_native_view) {
+    Widget* child = new Widget;
+    Widget::InitParams child_params =
+        CreateParams(Widget::InitParams::TYPE_CONTROL);
+    child_params.native_widget = CreatePlatformNativeWidget(child);
+    child_params.parent = parent_native_view;
+    child->Init(child_params);
+    child->SetContentsView(new View);
+    return child;
+  }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
-// On Windows, it is possible for us to have a child window that is TYPE_POPUP.
-Widget* CreateChildPopupPlatformWidget(gfx::NativeView parent_native_view) {
-  Widget* child = new Widget;
-  Widget::InitParams child_params(Widget::InitParams::TYPE_POPUP);
-  child_params.child = true;
-  child_params.native_widget = CreatePlatformNativeWidget(child);
-  child_params.parent = parent_native_view;
-  child->Init(child_params);
-  child->SetContentsView(new View);
-  return child;
-}
+  // On Windows, it is possible for us to have a child window that is
+  // TYPE_POPUP.
+  Widget* CreateChildPopupPlatformWidget(gfx::NativeView parent_native_view) {
+    Widget* child = new Widget;
+    Widget::InitParams child_params =
+        CreateParams(Widget::InitParams::TYPE_POPUP);
+    child_params.child = true;
+    child_params.native_widget = CreatePlatformNativeWidget(child);
+    child_params.parent = parent_native_view;
+    child->Init(child_params);
+    child->SetContentsView(new View);
+    return child;
+  }
 #endif
 
-Widget* CreateTopLevelNativeWidget() {
-  Widget* toplevel = new Widget;
-  Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
-  toplevel->Init(params);
-  toplevel->SetContentsView(new View);
-  return toplevel;
-}
+  Widget* CreateTopLevelNativeWidget() {
+    Widget* toplevel = new Widget;
+    Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
+    toplevel->Init(params);
+    toplevel->SetContentsView(new View);
+    return toplevel;
+  }
 
-Widget* CreateChildNativeWidgetWithParent(Widget* parent) {
-  Widget* child = new Widget;
-  Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
-  params.parent_widget = parent;
-  child->Init(params);
-  child->SetContentsView(new View);
-  return child;
-}
+  Widget* CreateChildNativeWidgetWithParent(Widget* parent) {
+    Widget* child = new Widget;
+    Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_CONTROL);
+    params.parent_widget = parent;
+    child->Init(params);
+    child->SetContentsView(new View);
+    return child;
+  }
 
-Widget* CreateChildNativeWidget() {
-  return CreateChildNativeWidgetWithParent(NULL);
-}
+  Widget* CreateChildNativeWidget() {
+    return CreateChildNativeWidgetWithParent(NULL);
+  }
+};
 
 bool WidgetHasMouseCapture(const Widget* widget) {
   return static_cast<const internal::NativeWidgetPrivate*>(widget->
       native_widget())->HasCapture();
 }
 
 ui::WindowShowState GetWidgetShowState(const Widget* widget) {
   // Use IsMaximized/IsMinimized/IsFullScreen instead of GetWindowPlacement
   // because the former is implemented on all platforms but the latter is not.
   return widget->IsFullscreen() ? ui::SHOW_STATE_FULLSCREEN :
@@ skipping 308 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(OwnershipTestWidget);
 };
 
 // Widget owns its NativeWidget, part 1: NativeWidget is a platform-native
 // widget.
 TEST_F(WidgetOwnershipTest, Ownership_WidgetOwnsPlatformNativeWidget) {
   OwnershipTestState state;
 
   scoped_ptr<Widget> widget(new OwnershipTestWidget(&state));
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
       new OwnershipTestNativeWidgetPlatform(widget.get(), &state);
-  params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
 
   // Now delete the Widget, which should delete the NativeWidget.
   widget.reset();
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
 
   // TODO(beng): write test for this ownership scenario and the NativeWidget
   //             being deleted out from under the Widget.
 }
 
 // Widget owns its NativeWidget, part 2: NativeWidget is a NativeWidget.
 TEST_F(WidgetOwnershipTest, Ownership_WidgetOwnsViewsNativeWidget) {
   OwnershipTestState state;
 
   scoped_ptr<Widget> widget(new OwnershipTestWidget(&state));
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
       new OwnershipTestNativeWidgetPlatform(widget.get(), &state);
-  params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
 
   // Now delete the Widget, which should delete the NativeWidget.
   widget.reset();
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
 
   // TODO(beng): write test for this ownership scenario and the NativeWidget
   //             being deleted out from under the Widget.
 }
 
 // Widget owns its NativeWidget, part 3: NativeWidget is a NativeWidget,
 // destroy the parent view.
 TEST_F(WidgetOwnershipTest,
        Ownership_WidgetOwnsViewsNativeWidget_DestroyParentView) {
   OwnershipTestState state;
 
   Widget* toplevel = CreateTopLevelPlatformWidget();
 
   scoped_ptr<Widget> widget(new OwnershipTestWidget(&state));
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
       new OwnershipTestNativeWidgetPlatform(widget.get(), &state);
   params.parent_widget = toplevel;
-  params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
 
   // Now close the toplevel, which deletes the view hierarchy.
   toplevel->CloseNow();
 
   RunPendingMessages();
 
   // This shouldn't delete the widget because it shouldn't be deleted
   // from the native side.
   EXPECT_FALSE(state.widget_deleted);
@@ skipping 434 matching lines @@
   EXPECT_TRUE(toplevel->OnKeyEvent(backspace_p));
   ui::KeyEvent backspace_r(ui::ET_KEY_RELEASED, ui::VKEY_DELETE, 0, false);
   EXPECT_FALSE(toplevel->OnKeyEvent(backspace_r));
 
   toplevel->Close();
 }
 #endif  // defined(USE_AURA)
 
 }  // namespace
 }  // namespace views