alternate ntp: favicons and menu width enhancements for "Recent tabs" menu

chrome/browser/ui/views/wrench_menu.cc

 // Copyright (c) 2012 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/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 718 matching lines @@
     // 0, its corresponding command id as used in the children menu item views
     // follows that of the parent menu item view |menu_item_|.
     int command_id = menu_item_->GetCommand() + 1 + index;
     views::MenuItemView* item = menu_item_->GetMenuItemByID(command_id);
     DCHECK(item);
     gfx::Image icon;
     if (model_->GetIconAt(index, &icon))
       item->SetIcon(*icon.ToImageSkia());
   }
 
+  // Return the specific menu width of recent tab menu item if |comamnd_id|
+  // refers to one of recent tabs menu items, else return -1.
+  int GetMaxWidthForMenu(int command_id) {
+    views::SubmenuView* submenu = menu_item_->GetSubmenu();

[sky, 2012/11/13 17:41:50]

Instead of checking the command make this take the MenuItem and compare against
that. It's safer.

[kuan, 2012/11/13 18:52:52]

Done.

+    if (!submenu)
+      return -1;
+    if (command_id < menu_item_->GetCommand() ||
+        command_id > menu_item_->GetCommand() + submenu->GetMenuItemCount()) {
+      return -1;
+    }
+    const int kMaxMenuItemWidth = 320;
+    return kMaxMenuItemWidth;
+  }
+
  private:
   ui::MenuModel* model_;
   views::MenuItemView* menu_item_;
 
   DISALLOW_COPY_AND_ASSIGN(RecentTabsMenuModelDelegate);
 };
 
 // WrenchMenu ------------------------------------------------------------------
 
 WrenchMenu::WrenchMenu(Browser* browser,
@@ skipping 137 matching lines @@
   return bookmark_menu_delegate_->WriteDragData(sender, data);
 }
 
 int WrenchMenu::GetDragOperations(MenuItemView* sender) {
   return is_bookmark_command(sender->GetCommand()) ?
       bookmark_menu_delegate_->GetDragOperations(sender) :
       MenuDelegate::GetDragOperations(sender);
 }
 
 int WrenchMenu::GetMaxWidthForMenu(MenuItemView* menu) {
-  return is_bookmark_command(menu->GetCommand()) ?
-      bookmark_menu_delegate_->GetMaxWidthForMenu(menu) :
-      MenuDelegate::GetMaxWidthForMenu(menu);
+  if (is_bookmark_command(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->GetCommand());
+  }
+  if (max_width == -1)
+    max_width = MenuDelegate::GetMaxWidthForMenu(menu);
+  return max_width;
 }
 
 bool WrenchMenu::IsItemChecked(int id) const {
   if (is_bookmark_command(id))
     return false;
 
   const Entry& entry = id_to_entry_.find(id)->second;
   return entry.first->IsItemCheckedAt(entry.second);
 }
 
@@ skipping 224 matching lines @@
   bookmark_menu_delegate_.reset(
       new BookmarkMenuDelegate(browser_,
                                browser_,
                                parent,
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
       this, bookmark_menu_, model->bookmark_bar_node(), 0,
       BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
       bookmark_utils::LAUNCH_WRENCH_MENU);
 }