| Index: views/controls/menu/menu_host.cc
|
| ===================================================================
|
| --- views/controls/menu/menu_host.cc (revision 83020)
|
| +++ views/controls/menu/menu_host.cc (working copy)
|
| @@ -22,10 +22,6 @@
|
| NativeMenuHost::CreateNativeMenuHost(this))),
|
| submenu_(submenu),
|
| destroying_(false) {
|
| - Widget::CreateParams params;
|
| - params.type = Widget::CreateParams::TYPE_MENU;
|
| - params.has_dropshadow = true;
|
| - GetWidget()->SetCreateParams(params);
|
| }
|
|
|
| MenuHost::~MenuHost() {
|
| @@ -35,7 +31,16 @@
|
| const gfx::Rect& bounds,
|
| View* contents_view,
|
| bool do_capture) {
|
| - native_menu_host_->InitMenuHost(parent, bounds);
|
| + Widget::CreateParams params;
|
| + params.type = Widget::CreateParams::TYPE_MENU;
|
| + params.has_dropshadow = true;
|
| +#if defined(OS_WIN)
|
| + params.parent = parent;
|
| +#elif defined(TOOLKIT_USES_GTK)
|
| + params.parent = GTK_WIDGET(parent);
|
| +#endif
|
| + params.bounds = bounds;
|
| + GetWidget()->Init(params);
|
| GetWidget()->SetContentsView(contents_view);
|
| ShowMenuHost(do_capture);
|
| }
|
|
|