Re-land:

views/controls/menu/menu_host_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/menu/menu_host_gtk.h"
 
 #include <gdk/gdk.h>
 
 #if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
 #include <gdk/gdkx.h>
 #include <X11/extensions/XInput2.h>
 #endif
 
 #include "views/controls/menu/native_menu_host_delegate.h"
 
 #if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
 #include "views/touchui/touch_factory.h"
 #endif
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuHostGtk, public:
 
 MenuHostGtk::MenuHostGtk(internal::NativeMenuHostDelegate* delegate)
-    : did_input_grab_(false),
+    : WidgetGtk(delegate->AsNativeWidgetDelegate()),
+      did_input_grab_(false),
       delegate_(delegate) {
 }
 
 MenuHostGtk::~MenuHostGtk() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuHostGtk, NativeMenuHost implementation:
 
 void MenuHostGtk::StartCapturing() {
@@ skipping 38 matching lines @@
 }
 
 NativeWidget* MenuHostGtk::AsNativeWidget() {
   return this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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);
   gtk_window_set_type_hint(GTK_WINDOW(GetNativeView()),
                            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_) {
     did_input_grab_ = false;
     gdk_pointer_ungrab(GDK_CURRENT_TIME);
     gdk_keyboard_ungrab(GDK_CURRENT_TIME);
 #if defined(HAVE_XINPUT2) && defined(TOUCH_UI)
     TouchFactory::GetInstance()->UngrabTouchDevices(
         GDK_WINDOW_XDISPLAY(window_contents()->window));
 #endif
@@ skipping 26 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuHost, public:
 
 // static
 NativeMenuHost* NativeMenuHost::CreateNativeMenuHost(
     internal::NativeMenuHostDelegate* delegate) {
   return new MenuHostGtk(delegate);
 }
 
 }  // namespace views