Changes the tab menu to use pin and unpin instead of a check. The mac

chrome/browser/views/tabs/tab.cc

 // Copyright (c) 2010 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/l10n_util.h"
 #include "app/menus/simple_menu_model.h"
 #include "app/resource_bundle.h"
 #include "base/compiler_specific.h"
@@ skipping 11 matching lines @@
 
 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::Delegate {
  public:
   explicit TabContextMenuContents(Tab* tab)
-      : ALLOW_THIS_IN_INITIALIZER_LIST(model_(this)),
+      : ALLOW_THIS_IN_INITIALIZER_LIST(
+          model_(this, tab->delegate()->IsTabPinned(tab))),
         tab_(tab),
         last_command_(TabStripModel::CommandFirst) {
     Build();
   }
   virtual ~TabContextMenuContents() {
     menu_->CancelMenu();
     tab_->delegate()->StopAllHighlighting();
   }
 
   void RunMenuAt(const gfx::Point& point) {
     // Save a pointer to delegate before we call RunMenuAt, because it runs a
     // nested message loop that may not return until after we are deleted.
     Tab::TabDelegate* delegate = tab_->delegate();
     menu_->RunMenuAt(point, views::Menu2::ALIGN_TOPLEFT);
     // We could be gone now. Assume |this| is junk!
     if (delegate)
       delegate->StopAllHighlighting();
   }
 
   // Overridden from menus::SimpleMenuModel::Delegate:
   virtual bool IsCommandIdChecked(int command_id) const {
-    if (!tab_ || command_id != TabStripModel::CommandTogglePinned)
-      return false;
-    return tab_->delegate()->IsTabPinned(tab_);
+    return false;
   }
   virtual bool IsCommandIdEnabled(int command_id) const {
     return tab_ && tab_->delegate()->IsCommandEnabledForTab(
         static_cast<TabStripModel::ContextMenuCommand>(command_id),
         tab_);
   }
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       menus::Accelerator* accelerator) {
     return tab_->GetWidget()->GetAccelerator(command_id, accelerator);
@@ skipping 128 matching lines @@
   *role = AccessibilityTypes::ROLE_PAGETAB;
   return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tab, views::ContextMenuController implementation:
 
 void Tab::ShowContextMenu(views::View* source,
                           const gfx::Point& p,
                           bool is_mouse_gesture) {
-  if (!context_menu_contents_.get())
-    context_menu_contents_.reset(new TabContextMenuContents(this));
+  context_menu_contents_.reset(new TabContextMenuContents(this));
   context_menu_contents_->RunMenuAt(p);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // views::ButtonListener implementation:
 
 void Tab::ButtonPressed(views::Button* sender, const views::Event& event) {
   if (sender == close_button())
     delegate_->CloseTab(this);
 }
@@ skipping 19 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();
 }