Factor tab context menu into a shared model and fix mac and win to use it. Im...

chrome/browser/views/tabs/tab.cc

 // Copyright (c) 2006-2008 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/views/tabs/tab.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
 #include "app/menus/simple_menu_model.h"
 #include "app/resource_bundle.h"
 #include "base/compiler_specific.h"
 #include "base/gfx/size.h"
+#include "chrome/browser/tab_menu_model.h"
 #include "chrome/browser/views/frame/browser_extender.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "grit/generated_resources.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/widget/widget.h"
 
 const std::string Tab::kTabClassName = "browser/tabs/Tab";
 
 static const SkScalar kTabCapWidth = 15;
 static const SkScalar kTabTopCurveWidth = 4;
 static const SkScalar kTabBottomCurveWidth = 3;
 
-class Tab::TabContextMenuContents : public menus::SimpleMenuModel,
-                                    public menus::SimpleMenuModel::Delegate {
+class Tab::TabContextMenuContents : public menus::SimpleMenuModel::Delegate {
  public:
   explicit TabContextMenuContents(Tab* tab)
-      : ALLOW_THIS_IN_INITIALIZER_LIST(menus::SimpleMenuModel(this)),
+      : ALLOW_THIS_IN_INITIALIZER_LIST(model_(this)),
         tab_(tab),
         last_command_(TabStripModel::CommandFirst) {
     Build();
   }
   virtual ~TabContextMenuContents() {
     menu_->CancelMenu();
     tab_->delegate()->StopAllHighlighting();
   }
 
   void RunMenuAt(const gfx::Point& point) {
@@ skipping 33 matching lines @@
   virtual void ExecuteCommand(int command_id) {
     if (!tab_)
       return;
     tab_->delegate()->ExecuteCommandForTab(
         static_cast<TabStripModel::ContextMenuCommand>(command_id),
         tab_);
   }
 
  private:
   void Build() {
-    AddItemWithStringId(TabStripModel::CommandNewTab, IDS_TAB_CXMENU_NEWTAB);
-    AddSeparator();
-    AddItemWithStringId(TabStripModel::CommandReload, IDS_TAB_CXMENU_RELOAD);
-    AddItemWithStringId(TabStripModel::CommandDuplicate,
-                        IDS_TAB_CXMENU_DUPLICATE);
-    AddCheckItemWithStringId(TabStripModel::CommandTogglePinned,
-                             IDS_TAB_CXMENU_PIN_TAB);
-    AddSeparator();
-    AddItemWithStringId(TabStripModel::CommandCloseTab,
-                        IDS_TAB_CXMENU_CLOSETAB);
-    AddItemWithStringId(TabStripModel::CommandCloseOtherTabs,
-                        IDS_TAB_CXMENU_CLOSEOTHERTABS);
-    AddItemWithStringId(TabStripModel::CommandCloseTabsToRight,
-                        IDS_TAB_CXMENU_CLOSETABSTORIGHT);
-    AddItemWithStringId(TabStripModel::CommandCloseTabsOpenedBy,
-                        IDS_TAB_CXMENU_CLOSETABSOPENEDBY);
-    AddSeparator();
-    AddItemWithStringId(TabStripModel::CommandRestoreTab, IDS_RESTORE_TAB);
-    AddItemWithStringId(TabStripModel::CommandBookmarkAllTabs,
-                        IDS_TAB_CXMENU_BOOKMARK_ALL_TABS);
-    menu_.reset(new views::Menu2(this));
+    menu_.reset(new views::Menu2(&model_));
   }
 
+  TabMenuModel model_;
   scoped_ptr<views::Menu2> menu_;
 
   // The Tab the context menu was brought up for. Set to NULL when the menu
   // is canceled.
   Tab* tab_;
 
   // The last command that was selected, so that we can start/stop highlighting
   // appropriately as the user moves through the menu.
   TabStripModel::ContextMenuCommand last_command_;
 
@@ skipping 169 matching lines @@
 
   // Right end cap.
   path->lineTo(w - kTabCapWidth + kTabTopCurveWidth, kTabTopCurveWidth);
   path->lineTo(w - kTabBottomCurveWidth, h - kTabBottomCurveWidth);
   path->lineTo(w, h);
 
   // Close out the path.
   path->lineTo(0, h);
   path->close();
 }