Refactors building the system menu model into a common place

chrome/browser/ui/views/frame/browser_frame.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/frame/browser_frame.h"
 
 #include "ash/shell.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window_state.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/frame/browser_root_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/native_browser_frame.h"
+#include "chrome/browser/ui/views/frame/system_menu_model_builder.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
+#include "ui/base/hit_test.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/controls/menu/menu_model_adapter.h"
+#include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/widget/native_widget.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, public:
 
 BrowserFrame::BrowserFrame(BrowserView* browser_view)
@@ skipping 31 matching lines @@
     params.type = views::Widget::InitParams::TYPE_PANEL;
   }
 #if defined(USE_ASH)
   if (browser_view_->browser()->host_desktop_type() ==
       chrome::HOST_DESKTOP_TYPE_ASH) {
     params.context = ash::Shell::GetAllRootWindows()[0];
   }
 #endif
   Init(params);
 
-  native_browser_frame_->InitSystemContextMenu();
+  if (!native_browser_frame_->UsesNativeSystemMenu()) {
+    DCHECK(non_client_view());
+    non_client_view()->set_context_menu_controller(this);
+  }
 }
 
 int BrowserFrame::GetMinimizeButtonOffset() const {
   return native_browser_frame_->GetMinimizeButtonOffset();
 }
 
 gfx::Rect BrowserFrame::GetBoundsForTabStrip(views::View* tabstrip) const {
   return browser_frame_view_->GetBoundsForTabStrip(tabstrip);
 }
 
@@ skipping 53 matching lines @@
     // active on the users desktop, then none of the windows contained in the
     // remote desktop will be activated.  However, NativeWidgetWin::Activate()
     // will still bring this browser window to the foreground.  We explicitly
     // set ourselves as the last active browser window to ensure that we get
     // treated as such by the rest of Chrome.
     BrowserList::SetLastActive(browser_view_->browser());
   }
   Widget::OnNativeWidgetActivationChanged(active);
 }
 
+void BrowserFrame::ShowContextMenuForView(views::View* source,
+                                          const gfx::Point& p) {
+  // Only show context menu if point is in unobscured parts of browser, i.e.
+  // if NonClientHitTest returns :
+  // - HTCAPTION: in title bar or unobscured part of tabstrip
+  // - HTNOWHERE: as the name implies.
+  gfx::Point point_in_view_coords(p);
+  views::View::ConvertPointFromScreen(non_client_view(), &point_in_view_coords);
+  int hit_test = non_client_view()->NonClientHitTest(point_in_view_coords);
+  if (hit_test == HTCAPTION || hit_test == HTNOWHERE) {
+    views::MenuModelAdapter menu_adapter(GetSystemMenuModel());
+    menu_runner_.reset(new views::MenuRunner(menu_adapter.CreateMenu()));
+    if (menu_runner_->RunMenuAt(source->GetWidget(), NULL,
+          gfx::Rect(p, gfx::Size(0,0)), views::MenuItemView::TOPLEFT,
+          views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
+        views::MenuRunner::MENU_DELETED)
+      return;
+  }
+}
+
+ui::MenuModel* BrowserFrame::GetSystemMenuModel() {
+  if (!menu_model_builder_.get()) {
+    menu_model_builder_.reset(
+        new SystemMenuModelBuilder(browser_view_, browser_view_->browser()));
+    menu_model_builder_->Init();
+  }
+  return menu_model_builder_->menu_model();
+}
+
 AvatarMenuButton* BrowserFrame::GetAvatarMenuButton() {
   return browser_frame_view_->avatar_button();
 }
 
 #if !defined(OS_WIN) || defined(USE_AURA)
 bool BrowserFrame::ShouldLeaveOffsetNearTopBorder() {
   return !IsMaximized();
 }
 #endif  // OS_WIN