diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 17:58:09 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 17:58:09 +0000 |
| commit | 0ef6c772205144c383c8956218425bb160a5ecd8 (patch) | |
| tree | 052314732e2318bf090fbe631737e66ed79c87c5 /views/examples | |
| parent | d2ceb4e7fe001e55d540784abac24620dc6b4a4a (diff) | |
| download | chromium_src-0ef6c772205144c383c8956218425bb160a5ecd8.zip chromium_src-0ef6c772205144c383c8956218425bb160a5ecd8.tar.gz chromium_src-0ef6c772205144c383c8956218425bb160a5ecd8.tar.bz2 | |
Convert more WidgetWin/WidgetGtk creations to use a new cross-platform static ctor on Widget: CreateWidget().
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/6732028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/examples')
| -rw-r--r-- | views/examples/widget_example.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/views/examples/widget_example.cc b/views/examples/widget_example.cc index 7b53a69..d72276c 100644 --- a/views/examples/widget_example.cc +++ b/views/examples/widget_example.cc @@ -8,10 +8,7 @@ #include "views/layout/box_layout.h" #include "views/layout/layout_manager.h" #include "views/view.h" - -#if defined(OS_LINUX) -#include "views/widget/widget_gtk.h" -#endif +#include "views/widget/widget.h" namespace { @@ -111,10 +108,9 @@ void WidgetExample::InitWidget(views::Widget* widget, bool transparent) { #if defined(OS_LINUX) void WidgetExample::CreateChild(views::View* parent, bool transparent) { - views::WidgetGtk* widget = - new views::WidgetGtk(views::WidgetGtk::TYPE_CHILD); - if (transparent) - widget->MakeTransparent(); + views::Widget::CreateParams params(views::Widget::CreateParams::TYPE_CONTROL); + params.transparent = transparent; + views::Widget* widget = views::Widget::CreateWidget(params); // Compute where to place the child widget. // We'll place it at the center of the root widget. views::Widget* parent_widget = parent->GetWidget(); @@ -131,7 +127,7 @@ void WidgetExample::CreateChild(views::View* parent, bool transparent) { void WidgetExample::CreatePopup(views::View* parent, bool transparent) { views::Widget::CreateParams params(views::Widget::CreateParams::TYPE_POPUP); params.transparent = transparent; - views::Widget* widget = views::Widget::CreatePopupWidget(params); + views::Widget* widget = views::Widget::CreateWidget(params); // Compute where to place the popup widget. // We'll place it right below the create button. |