| Index: ui/views/examples/widget_example.h
|
| diff --git a/ui/views/examples/widget_example.h b/ui/views/examples/widget_example.h
|
| index 88a8c4220d5dc7394939f07c08836dc2374e7032..cdeb1a47dc8f42166d54faf7b3d8b3a42ac520d4 100644
|
| --- a/ui/views/examples/widget_example.h
|
| +++ b/ui/views/examples/widget_example.h
|
| @@ -9,7 +9,7 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| -#include "ui/views/controls/button/text_button.h"
|
| +#include "ui/views/controls/button/button.h"
|
| #include "ui/views/examples/example_base.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| @@ -28,21 +28,14 @@ class WidgetExample : public ExampleBase, public ButtonListener {
|
| private:
|
| enum Command {
|
| POPUP,
|
| + DIALOG,
|
| CHILD,
|
| - TRANSPARENT_POPUP,
|
| - TRANSPARENT_CHILD,
|
| CLOSE_WIDGET,
|
| };
|
|
|
| void BuildButton(View* container, const std::string& label, int tag);
|
|
|
| - void InitWidget(Widget* widget, bool transparent);
|
| -
|
| -#if defined(OS_LINUX)
|
| - void CreateChild(View* parent, bool transparent);
|
| -#endif
|
| -
|
| - void CreatePopup(View* parent, bool transparent);
|
| + void ShowWidget(View* sender, Widget::InitParams params);
|
|
|
| // Overridden from ButtonListener:
|
| virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
|
|
|