| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "views/widget/native_widget_test_utils.h" | 5 #include "views/widget/native_widget_test_utils.h" |
| 6 | 6 |
| 7 #include "views/view.h" | 7 #include "views/view.h" |
| 8 #include "views/widget/native_widget.h" | 8 #include "views/widget/native_widget.h" |
| 9 #include "views/widget/widget.h" | 9 #include "views/widget/widget.h" |
| 10 | 10 |
| 11 namespace views { | 11 namespace views { |
| 12 namespace internal { | 12 namespace internal { |
| 13 | 13 |
| 14 NativeWidget* CreateNativeWidget() { | 14 NativeWidget* CreateNativeWidget() { |
| 15 return CreateNativeWidgetWithContents(new View); | 15 return CreateNativeWidgetWithContents(new View); |
| 16 } | 16 } |
| 17 | 17 |
| 18 NativeWidget* CreateNativeWidgetWithContents(View* contents_view) { | 18 NativeWidget* CreateNativeWidgetWithContents(View* contents_view) { |
| 19 Widget* widget = new Widget; | 19 Widget* widget = new Widget; |
| 20 Widget::InitParams params(Widget::InitParams::TYPE_WINDOW); | 20 Widget::InitParams params(Widget::InitParams::TYPE_WINDOW); |
| 21 params.delete_on_destroy = false; | 21 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| 22 params.bounds = gfx::Rect(10, 10, 200, 200); | 22 params.bounds = gfx::Rect(10, 10, 200, 200); |
| 23 widget->Init(params); | 23 widget->Init(params); |
| 24 return widget->native_widget(); | 24 return widget->native_widget(); |
| 25 } | 25 } |
| 26 | 26 |
| 27 NativeWidget* CreateNativeWidgetWithParent(NativeWidget* parent) { | 27 NativeWidget* CreateNativeWidgetWithParent(NativeWidget* parent) { |
| 28 Widget* widget = new Widget; | 28 Widget* widget = new Widget; |
| 29 Widget::InitParams params(Widget::InitParams::TYPE_CONTROL); | 29 Widget::InitParams params(Widget::InitParams::TYPE_CONTROL); |
| 30 params.delete_on_destroy = false; | 30 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| 31 params.child = false; // Implicitly set to true by ctor with TYPE_CONTROL. | 31 params.child = false; // Implicitly set to true by ctor with TYPE_CONTROL. |
| 32 params.parent = parent ? parent->GetWidget()->GetNativeView() : NULL; | 32 params.parent = parent ? parent->GetWidget()->GetNativeView() : NULL; |
| 33 params.bounds = gfx::Rect(10, 10, 200, 200); | 33 params.bounds = gfx::Rect(10, 10, 200, 200); |
| 34 widget->Init(params); | 34 widget->Init(params); |
| 35 return widget->native_widget(); | 35 return widget->native_widget(); |
| 36 } | 36 } |
| 37 | 37 |
| 38 } // namespace internal | 38 } // namespace internal |
| 39 } // namespace ui | 39 } // namespace ui |
| OLD | NEW |