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

chrome/browser/cocoa/tab_controller.mm

 // 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 "app/l10n_util_mac.h"
 #include "base/mac_util.h"
 #import "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/menu_controller.h"
 #import "chrome/browser/cocoa/tab_controller.h"
 #import "chrome/browser/cocoa/tab_controller_target.h"
@@ skipping 10 matching lines @@
 @synthesize action = action_;
 
 namespace TabControllerInternal {
 
 // A C++ delegate that handles enabling/disabling menu items and handling when
 // a menu command is chosen. Also fixes up the menu item label for "pin/unpin
 // tab".
 class MenuDelegate : public menus::SimpleMenuModel::Delegate {
  public:
   explicit MenuDelegate(id<TabControllerTarget> target, TabController* owner)
-      : target_(target), owner_(owner) { }
+      : target_(target),
+        owner_(owner) {}
 
   // Overridden from menus::SimpleMenuModel::Delegate
   virtual bool IsCommandIdChecked(int command_id) const { return false; }
   virtual bool IsCommandIdEnabled(int command_id) const {
     TabStripModel::ContextMenuCommand command =
         static_cast<TabStripModel::ContextMenuCommand>(command_id);
     return [target_ isCommandEnabled:command forController:owner_];
   }
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       menus::Accelerator* accelerator) { return false; }
   virtual void ExecuteCommand(int command_id) {
     TabStripModel::ContextMenuCommand command =
         static_cast<TabStripModel::ContextMenuCommand>(command_id);
     [target_ commandDispatch:command forController:owner_];
   }
 
-  virtual bool IsLabelForCommandIdDynamic(int command_id) const {
-    return command_id == TabStripModel::CommandTogglePinned;
-  }
-  virtual string16 GetLabelForCommandId(int command_id) const {
-    // Display "Pin Tab" when the tab is not pinned and "Unpin Tab" when it is
-    // (this is not a checkmark menu item, per Apple's HIG).
-    if (command_id == TabStripModel::CommandTogglePinned) {
-      return l10n_util::GetStringUTF16(
-          [owner_ mini] ? IDS_TAB_CXMENU_UNPIN_TAB_MAC
-                          : IDS_TAB_CXMENU_PIN_TAB_MAC);
-    }
-    return string16();
-  }
-
  private:
   id<TabControllerTarget> target_;  // weak
   TabController* owner_;  // weak, owns me
 };
 
 }  // TabControllerInternal namespace
 
 // The min widths match the windows values and are sums of left + right
 // padding, of which we have no comparable constants (we draw using paths, not
 // images). The selected tab width includes the close button width.
@@ skipping 58 matching lines @@
 
   [self internalSetSelected:selected_];
 }
 
 // Called when Cocoa wants to display the context menu. Lazily instantiate
 // the menu based off of the cross-platform model. Re-create the menu and
 // model every time to get the correct labels and enabling.
 - (NSMenu*)menu {
   contextMenuDelegate_.reset(
       new TabControllerInternal::MenuDelegate(target_, self));
-  contextMenuModel_.reset(new TabMenuModel(contextMenuDelegate_.get()));
+  // TODO(42339): this is wrong, it should use pinned, not mini.
+  contextMenuModel_.reset(new TabMenuModel(contextMenuDelegate_.get(),
+                                           [self mini]));
   contextMenuController_.reset(
       [[MenuController alloc] initWithModel:contextMenuModel_.get()
                      useWithPopUpButtonCell:NO]);
   return [contextMenuController_ menu];
 }
 
 - (IBAction)closeTab:(id)sender {
   if ([[self target] respondsToSelector:@selector(closeTab:)]) {
     [[self target] performSelector:@selector(closeTab:)
                         withObject:[self view]];
@@ skipping 153 matching lines @@
 // Called by the tabs to determine whether we are in rapid (tab) closure mode.
 - (BOOL)inRapidClosureMode {
   if ([[self target] respondsToSelector:@selector(inRapidClosureMode)]) {
     return [[self target] performSelector:@selector(inRapidClosureMode)] ?
         YES : NO;
   }
   return NO;
 }
 
 @end