Alternate NTP: Limit width of tab titles in recent tabs menu

chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 
 #include "base/basictypes.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/string16.h"
@@ skipping 26 matching lines @@
 using content::HostZoomMap;
 using content::UserMetricsAction;
 
 @interface WrenchMenuController (Private)
 - (void)createModel;
 - (void)adjustPositioning;
 - (void)performCommandDispatch:(NSNumber*)tag;
 - (NSButton*)zoomDisplay;
 - (void)removeAllItems:(NSMenu*)menu;
 - (NSMenu*)recentTabsSubmenu;
+- (int)maxWidthForMenuModel:(ui::MenuModel*)model
+                 modelIndex:(int)modelIndex;
 @end
 
 namespace WrenchMenuControllerInternal {
 
 // A C++ delegate that handles the accelerators in the wrench menu.
 class AcceleratorDelegate : public ui::AcceleratorProvider {
  public:
   virtual bool GetAcceleratorForCommandId(int command_id,
       ui::Accelerator* accelerator_generic) {
     // Downcast so that when the copy constructor is invoked below, the key
@@ skipping 263 matching lines @@
   while ([menu numberOfItems]) {
     [menu removeItemAtIndex:0];
   }
 }
 
 - (NSMenu*)recentTabsSubmenu {
   NSString* title = l10n_util::GetNSStringWithFixup(IDS_RECENT_TABS_MENU);
   return [[[self menu] itemWithTitle:title] submenu];
 }
 
+// This overrdies the parent class to return a custom width for recent tabs
+// menu.
+- (int)maxWidthForMenuModel:(ui::MenuModel*)model
+                 modelIndex:(int)modelIndex {
+  int index = 0;
+  ui::MenuModel* recentTabsMenuModel = [self wrenchMenuModel];
+  if (ui::MenuModel::GetModelAndIndexForCommandId(
+          IDC_RESTORE_TAB, &recentTabsMenuModel, &index)) {
+    if (recentTabsMenuModel == model)

[Robert Sesek, 2012/11/27 17:09:20]

nit: braces needed since the body is more than one line

[sail, 2012/11/28 07:38:25]

Done.

+      return static_cast<RecentTabsSubMenuModel*>(
+          recentTabsMenuModel)->GetMaxWidthForItemAtIndex(modelIndex);
+  }
+  return -1;
+}
+
 @end  // @implementation WrenchMenuController
 
 ////////////////////////////////////////////////////////////////////////////////
 
 @implementation WrenchMenuButtonViewController
 
 @synthesize editItem = editItem_;
 @synthesize editCut = editCut_;
 @synthesize editCopy = editCopy_;
 @synthesize editPaste = editPaste_;
 @synthesize zoomItem = zoomItem_;
 @synthesize zoomPlus = zoomPlus_;
 @synthesize zoomDisplay = zoomDisplay_;
 @synthesize zoomMinus = zoomMinus_;
 @synthesize zoomFullScreen = zoomFullScreen_;
 
 - (id)initWithController:(WrenchMenuController*)controller {
   if ((self = [super initWithNibName:@"WrenchMenu"
                               bundle:base::mac::FrameworkBundle()])) {
     controller_ = controller;
   }
   return self;
 }
 
 - (IBAction)dispatchWrenchMenuCommand:(id)sender {
   [controller_ dispatchWrenchMenuCommand:sender];
 }
 
 @end  // @implementation WrenchMenuButtonViewController