| Index: views/controls/menu/menu_host_gtk.cc
|
| ===================================================================
|
| --- views/controls/menu/menu_host_gtk.cc (revision 85284)
|
| +++ views/controls/menu/menu_host_gtk.cc (working copy)
|
| @@ -23,7 +23,8 @@
|
| // MenuHostGtk, public:
|
|
|
| MenuHostGtk::MenuHostGtk(internal::NativeMenuHostDelegate* delegate)
|
| - : did_input_grab_(false),
|
| + : WidgetGtk(delegate->AsNativeWidgetDelegate()),
|
| + did_input_grab_(false),
|
| delegate_(delegate) {
|
| }
|
|
|
| @@ -82,7 +83,6 @@
|
| // MenuHostGtk, WidgetGtk overrides:
|
|
|
| void MenuHostGtk::InitNativeWidget(const Widget::InitParams& params) {
|
| - make_transient_to_parent();
|
| WidgetGtk::InitNativeWidget(params);
|
| // Make sure we get destroyed when the parent is destroyed.
|
| gtk_window_set_destroy_with_parent(GTK_WINDOW(GetNativeView()), TRUE);
|
| @@ -90,15 +90,6 @@
|
| GDK_WINDOW_TYPE_HINT_MENU);
|
| }
|
|
|
| -// TODO(beng): remove once MenuHost is-a Widget
|
| -RootView* MenuHostGtk::CreateRootView() {
|
| - return delegate_->CreateRootView();
|
| -}
|
| -
|
| -bool MenuHostGtk::ShouldReleaseCaptureOnMouseReleased() const {
|
| - return delegate_->ShouldReleaseCaptureOnMouseRelease();
|
| -}
|
| -
|
| void MenuHostGtk::ReleaseMouseCapture() {
|
| WidgetGtk::ReleaseMouseCapture();
|
| if (did_input_grab_) {
|
|
|