Refactors building the system menu model into a common place

chrome/browser/ui/views/frame/browser_frame_win.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_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <set>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/metro.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/browser/ui/views/frame/system_menu_model.h"
-#include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 56 matching lines @@
   return switcher_button;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameWin, public:
 
 BrowserFrameWin::BrowserFrameWin(BrowserFrame* browser_frame,
                                  BrowserView* browser_view)
     : views::NativeWidgetWin(browser_frame),
       browser_view_(browser_view),
-      browser_frame_(browser_frame),
-      system_menu_delegate_(new SystemMenuModelDelegate(browser_view,
-          browser_view->browser())) {
+      browser_frame_(browser_frame) {
   if (win8::IsSingleWindowMetroMode()) {
     browser_view->SetWindowSwitcherButton(
         MakeWindowSwitcherButton(this, browser_view->IsOffTheRecord()));
   }
 }
 
 BrowserFrameWin::~BrowserFrameWin() {
 }
 
 // static
@@ skipping 21 matching lines @@
 #endif  // USE_AURA
   HMODULE metro = base::win::GetMetroModule();
   if (!metro)
     return;
   CloseFrameWindow close_frame_window = reinterpret_cast<CloseFrameWindow>(
       ::GetProcAddress(metro, "CloseFrameWindow"));
   close_frame_window(browser_frame_->GetNativeWindow());
 }
 
 
+views::NativeMenuWin* BrowserFrameWin::GetSystemMenu() {
+  if (!system_menu_.get()) {
+    system_menu_.reset(
+        new views::NativeMenuWin(browser_frame_->GetSystemMenuModel(),
+                                 GetNativeView()));
+    system_menu_->Rebuild();
+  }
+  return system_menu_.get();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameWin, views::NativeWidgetWin overrides:
 
 int BrowserFrameWin::GetInitialShowState() const {
   if (explicit_show_state != -1)
     return explicit_show_state;
 
   STARTUPINFO si = {0};
   si.cb = sizeof(si);
   si.dwFlags = STARTF_USESHOWWINDOW;
@@ skipping 63 matching lines @@
                SRCCOPY);
       ::ReleaseDC(GetNativeView(), src_dc);
       *result = 0;
       return true;
     }
     return false;
   case WM_ENDSESSION:
     browser::SessionEnding();
     return true;
   case WM_INITMENUPOPUP:
-    system_menu_->UpdateStates();
+    GetSystemMenu()->UpdateStates();
     return true;
   }
   return false;
 }
 
 void BrowserFrameWin::PostHandleMSG(UINT message,
                                     WPARAM w_param,
                                     LPARAM l_param) {
   switch (message) {
   case WM_CREATE:
@@ skipping 118 matching lines @@
 // BrowserFrameWin, NativeBrowserFrame implementation:
 
 views::NativeWidget* BrowserFrameWin::AsNativeWidget() {
   return this;
 }
 
 const views::NativeWidget* BrowserFrameWin::AsNativeWidget() const {
   return this;
 }
 
-void BrowserFrameWin::InitSystemContextMenu() {
-  system_menu_contents_.reset(new SystemMenuModel(system_menu_delegate_.get()));
-  // We add the menu items in reverse order so that insertion_index never needs
-  // to change.
-  if (browser_view_->IsBrowserTypeNormal())
-    BuildSystemMenuForBrowserWindow();
-  else
-    BuildSystemMenuForAppOrPopupWindow();
-  AddFrameToggleItems();
-  system_menu_.reset(
-      new views::NativeMenuWin(system_menu_contents_.get(), GetNativeWindow()));
-  system_menu_->Rebuild();
+bool BrowserFrameWin::UsesNativeSystemMenu() const {
+  return true;
 }
 
 int BrowserFrameWin::GetMinimizeButtonOffset() const {
   return minimize_button_metrics_.GetMinimizeButtonOffsetX();
 }
 
 void BrowserFrameWin::TabStripDisplayModeChanged() {
   UpdateDWMFrame();
 }
 
@@ skipping 68 matching lines @@
     if (!IsFullscreen()) {
       gfx::Rect tabstrip_bounds(
           browser_frame_->GetBoundsForTabStrip(browser_view_->tabstrip()));
       margins.cyTopHeight = tabstrip_bounds.bottom() + kDWMFrameTopOffset;
     }
   }
 
   DwmExtendFrameIntoClientArea(GetNativeView(), &margins);
 }
 
-void BrowserFrameWin::BuildSystemMenuForBrowserWindow() {
-  system_menu_contents_->AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
-  system_menu_contents_->AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
-  if (chrome::CanOpenTaskManager()) {
-    system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
-    system_menu_contents_->AddItemWithStringId(IDC_TASK_MANAGER,
-                                               IDS_TASK_MANAGER);
-  }
-  system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
-  // If it's a regular browser window with tabs, we don't add any more items,
-  // since it already has menus (Page, Chrome).
-}
-
-void BrowserFrameWin::BuildSystemMenuForAppOrPopupWindow() {
-  Browser* browser = browser_view()->browser();
-  system_menu_contents_->AddItemWithStringId(IDC_BACK,
-                                             IDS_CONTENT_CONTEXT_BACK);
-  system_menu_contents_->AddItemWithStringId(IDC_FORWARD,
-                                             IDS_CONTENT_CONTEXT_FORWARD);
-  system_menu_contents_->AddItemWithStringId(IDC_RELOAD, IDS_APP_MENU_RELOAD);
-  system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
-  if (browser->is_app()) {
-    system_menu_contents_->AddItemWithStringId(IDC_NEW_TAB,
-                                               IDS_APP_MENU_NEW_WEB_PAGE);
-  } else {
-    system_menu_contents_->AddItemWithStringId(IDC_SHOW_AS_TAB,
-                                               IDS_SHOW_AS_TAB);
-  }
-  system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
-  system_menu_contents_->AddItemWithStringId(IDC_CUT, IDS_CUT);
-  system_menu_contents_->AddItemWithStringId(IDC_COPY, IDS_COPY);
-  system_menu_contents_->AddItemWithStringId(IDC_PASTE, IDS_PASTE);
-  system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
-  system_menu_contents_->AddItemWithStringId(IDC_FIND, IDS_FIND);
-  system_menu_contents_->AddItemWithStringId(IDC_PRINT, IDS_PRINT);
-  zoom_menu_contents_.reset(new ZoomMenuModel(system_menu_delegate_.get()));
-  system_menu_contents_->AddSubMenuWithStringId(IDC_ZOOM_MENU, IDS_ZOOM_MENU,
-                                                zoom_menu_contents_.get());
-  encoding_menu_contents_.reset(new EncodingMenuModel(browser));
-  system_menu_contents_->AddSubMenuWithStringId(IDC_ENCODING_MENU,
-                                                IDS_ENCODING_MENU,
-                                                encoding_menu_contents_.get());
-  system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
-  if (browser->is_app() && chrome::CanOpenTaskManager()) {
-    system_menu_contents_->AddItemWithStringId(IDC_TASK_MANAGER,
-                                               IDS_TASK_MANAGER);
-    system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
-  }
-}
-
-void BrowserFrameWin::AddFrameToggleItems() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDebugEnableFrameToggle)) {
-    system_menu_contents_->AddItem(IDC_DEBUG_FRAME_TOGGLE,
-                                   L"Toggle Frame Type");
-    system_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
-  }
-}
-
 void BrowserFrameWin::HandleMetroNavSearchRequest(WPARAM w_param,
                                                   LPARAM l_param) {
   if (!base::win::IsMetroProcess()) {
     NOTREACHED() << "Received unexpected metro navigation request";
     return;
   }
 
   if (!w_param && !l_param) {
     NOTREACHED() << "Invalid metro request parameters";
     return;
@@ skipping 75 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameWin(browser_frame, browser_view);
 }