remove 320 max-width restriction for Recent Tabs

chrome/browser/ui/views/toolbar/wrench_menu.cc

 // Copyright 2013 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/toolbar/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 709 matching lines @@
       : wrench_menu_(wrench_menu),
         model_(model),
         menu_item_(menu_item) {
     model_->SetMenuModelDelegate(this);
   }
 
   virtual ~RecentTabsMenuModelDelegate() {
     model_->SetMenuModelDelegate(NULL);
   }
 
-  // Return the specific menu width of recent tabs submenu if |menu| is the
-  // recent tabs submenu, else return -1.
-  int GetMaxWidthForMenu(views::MenuItemView* menu) {
-    if (!menu_item_->HasSubmenu())
-      return -1;
-    const int kMaxMenuItemWidth = 320;
-    return menu->GetCommand() == menu_item_->GetCommand() ?
-        kMaxMenuItemWidth : -1;
-  }
-
   const gfx::FontList* GetLabelFontListAt(int index) const {
     return model_->GetLabelFontListAt(index);
   }
 
   bool GetShouldUseDisabledEmphasizedForegroundColor(int index) const {
     // The items for which we get a font list, should be shown in the bolded
     // color.
     return GetLabelFontListAt(index) ? true : false;
   }
 
@@ skipping 227 matching lines @@
 
 int WrenchMenu::GetDragOperations(MenuItemView* sender) {
   return IsBookmarkCommand(sender->GetCommand()) ?
       bookmark_menu_delegate_->GetDragOperations(sender) :
       MenuDelegate::GetDragOperations(sender);
 }
 
 int WrenchMenu::GetMaxWidthForMenu(MenuItemView* menu) {
   if (IsBookmarkCommand(menu->GetCommand()))
     return bookmark_menu_delegate_->GetMaxWidthForMenu(menu);
-  int max_width = -1;
-  // If recent tabs menu is available, it will decide if |menu| is one of recent
-  // tabs; if yes, it would return the menu width for recent tabs.
-  // otherwise, it would return -1.
-  if (recent_tabs_menu_model_delegate_.get())
-    max_width = recent_tabs_menu_model_delegate_->GetMaxWidthForMenu(menu);
-  if (max_width == -1)
-    max_width = MenuDelegate::GetMaxWidthForMenu(menu);
-  return max_width;
+  return MenuDelegate::GetMaxWidthForMenu(menu);
 }
 
 bool WrenchMenu::IsItemChecked(int command_id) const {
   if (IsBookmarkCommand(command_id))
     return false;
 
   const Entry& entry = command_id_to_entry_.find(command_id)->second;
   return entry.first->IsItemCheckedAt(entry.second);
 }
 
@@ skipping 255 matching lines @@
                                 0,
                                 BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
                                 BOOKMARK_LAUNCH_LOCATION_WRENCH_MENU);
 }
 
 int WrenchMenu::ModelIndexFromCommandId(int command_id) const {
   CommandIDToEntry::const_iterator ix = command_id_to_entry_.find(command_id);
   DCHECK(ix != command_id_to_entry_.end());
   return ix->second.second;
 }