Re-land:

views/controls/menu/menu_host.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_MENU_MENU_HOST_H_
 #define VIEWS_CONTROLS_MENU_MENU_HOST_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "views/controls/menu/native_menu_host_delegate.h"
+#include "views/widget/widget.h"
 
 namespace views {
 
 class NativeMenuHost;
 class NativeWidget;
 class SubmenuView;
 class View;
 class Widget;
 
 // SubmenuView uses a MenuHost to house the SubmenuView. MenuHost typically
 // extends the native Widget type, but is defined here for clarity of what
 // methods SubmenuView uses.
 //
 // SubmenuView owns the MenuHost. When SubmenuView is done with the MenuHost
 // |DestroyMenuHost| is invoked. The one exception to this is if the native
 // OS destroys the widget out from under us, in which case |MenuHostDestroyed|
 // is invoked back on the SubmenuView and the SubmenuView then drops references
 // to the MenuHost.
-class MenuHost : public internal::NativeMenuHostDelegate {
+class MenuHost : public Widget,
+                 public internal::NativeMenuHostDelegate {
  public:
   explicit MenuHost(SubmenuView* submenu);
   virtual ~MenuHost();
 
   // Initializes and shows the MenuHost.
   void InitMenuHost(gfx::NativeWindow parent,
                     const gfx::Rect& bounds,
                     View* contents_view,
                     bool do_capture);
 
@@ skipping 16 matching lines @@
   // Releases a mouse grab installed by |ShowMenuHost|.
   void ReleaseMenuHostCapture();
 
   // Returns the native window of the MenuHost.
   gfx::NativeWindow GetMenuHostWindow();
 
   Widget* GetWidget();
   NativeWidget* GetNativeWidget();
 
  private:
+  // Overridden from Widget:
+  virtual RootView* CreateRootView() OVERRIDE;
+  virtual bool ShouldReleaseCaptureOnMouseReleased() const OVERRIDE;
+
   // Overridden from NativeMenuHostDelegate:
   virtual void OnNativeMenuHostDestroy() OVERRIDE;
   virtual void OnNativeMenuHostCancelCapture() OVERRIDE;
-  virtual RootView* CreateRootView() OVERRIDE;
-  virtual bool ShouldReleaseCaptureOnMouseRelease() const OVERRIDE;
+  virtual internal::NativeWidgetDelegate* AsNativeWidgetDelegate() OVERRIDE;
 
   NativeMenuHost* native_menu_host_;
 
   // The view we contain.
   SubmenuView* submenu_;
 
   // If true, DestroyMenuHost has been invoked.
   bool destroying_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuHost);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_HOST_H_