Refactors building the system menu model into a common place

chrome/browser/ui/views/frame/browser_frame_aura.h

Index: chrome/browser/ui/views/frame/browser_frame_aura.h
diff --git a/chrome/browser/ui/views/frame/browser_frame_aura.h b/chrome/browser/ui/views/frame/browser_frame_aura.h
index 98ee955713546356432c52eefd8f7d992759c347..8b9b6b10477860bef157afb129189198885b7c4a 100644
--- a/chrome/browser/ui/views/frame/browser_frame_aura.h
+++ b/chrome/browser/ui/views/frame/browser_frame_aura.h
@@ -8,24 +8,18 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
-#include "ui/views/context_menu_controller.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 class BrowserFrame;
 class BrowserView;
 
-namespace views {
-class MenuRunner;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura
 //
 //  BrowserFrameAura is a NativeWidgetAura subclass that provides the window
 //  frame for the Chrome browser window.
 //
-class BrowserFrameAura : public views::ContextMenuController,
-                         public views::NativeWidgetAura,
+class BrowserFrameAura : public views::NativeWidgetAura,
                          public NativeBrowserFrame {
  public:
   BrowserFrameAura(BrowserFrame* browser_frame, BrowserView* browser_view);
@@ -33,10 +27,6 @@ class BrowserFrameAura : public views::ContextMenuController,
   BrowserView* browser_view() const { return browser_view_; }
 
  protected:
-  // Overridden from views::ContextMenuController:
-  virtual void ShowContextMenuForView(views::View* source,
-                                      const gfx::Point& p) OVERRIDE;
-
   // Overridden from views::NativeWidgetAura:
   virtual void OnWindowDestroying() OVERRIDE;
   virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
@@ -44,7 +34,7 @@ class BrowserFrameAura : public views::ContextMenuController,
   // Overridden from NativeBrowserFrame:
   virtual views::NativeWidget* AsNativeWidget() OVERRIDE;
   virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE;
-  virtual void InitSystemContextMenu() OVERRIDE;
+  virtual bool UsesNativeSystemMenu() const OVERRIDE;
   virtual int GetMinimizeButtonOffset() const OVERRIDE;
   virtual void TabStripDisplayModeChanged() OVERRIDE;
 
@@ -61,9 +51,6 @@ class BrowserFrameAura : public views::ContextMenuController,
 
   scoped_ptr<WindowPropertyWatcher> window_property_watcher_;
 
-  // System menu.
-  scoped_ptr<views::MenuRunner> menu_runner_;
-
   DISALLOW_COPY_AND_ASSIGN(BrowserFrameAura);
 };