alternate ntp: add "Recent Tabs" submenu to wrench 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 688 matching lines @@
   TextButton* decrement_button_;
 
   ImageButton* fullscreen_button_;
 
   // Width given to |zoom_label_|. This is the width at 100%.
   int zoom_label_width_;
 
   DISALLOW_COPY_AND_ASSIGN(ZoomView);
 };
 
+// RecentTabsMenuModelDelegate -------------------------------------------------
+
+// Provides the ui::MenuModelDelegate implementation for RecentTabsSubMenuModel
+// items.
+class WrenchMenu::RecentTabsMenuModelDelegate : public ui::MenuModelDelegate {
+ public:
+  RecentTabsMenuModelDelegate(ui::MenuModel* model,
+                              views::MenuItemView* menu_item)
+      : model_(model),
+        menu_item_(menu_item) {
+    model_->SetMenuModelDelegate(this);
+  }
+
+  virtual ~RecentTabsMenuModelDelegate() {
+    model_->SetMenuModelDelegate(NULL);
+  }
+
+  // ui::MenuModelDelegate implementation:
+  virtual void OnIconChanged(int index) OVERRIDE {
+    // |index| specifies position in children items of |menu_item_| starting at
+    // 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());
+  }
+
+ private:
+  ui::MenuModel* model_;
+  views::MenuItemView* menu_item_;
+
+  DISALLOW_COPY_AND_ASSIGN(RecentTabsMenuModelDelegate);
+};
+
 // WrenchMenu ------------------------------------------------------------------
 
 WrenchMenu::WrenchMenu(Browser* browser,
                        bool use_new_menu,
                        bool supports_new_separators)
     : root_(NULL),
       browser_(browser),
       selected_menu_model_(NULL),
       selected_index_(0),
       bookmark_menu_(NULL),
@@ skipping 174 matching lines @@
   const Entry& entry = id_to_entry_.find(id)->second;
   int command_id = entry.first->GetCommandIdAt(entry.second);
 
   if (command_id == IDC_CUT || command_id == IDC_ZOOM_MINUS) {
     // These items are represented by child views. If ExecuteCommand is invoked
     // it means the user clicked on the area around the buttons and we should
     // not do anyting.
     return;
   }
 
-  return entry.first->ActivatedAt(entry.second);
+  return entry.first->ActivatedAt(entry.second, mouse_event_flags);
 }
 
 bool WrenchMenu::GetAccelerator(int id, ui::Accelerator* accelerator) {
   if (is_bookmark_command(id))
     return false;
   IDToEntry::iterator ix = id_to_entry_.find(id);
   if (ix == id_to_entry_.end()) {
     // There is no entry for this id.
     return false;
   }
@@ skipping 32 matching lines @@
         SetVisibilityChangedAnimationsEnabled(false);
   }
 }
 
 void WrenchMenu::BookmarkModelChanged() {
   DCHECK(bookmark_menu_delegate_.get());
   if (!bookmark_menu_delegate_->is_mutating_model())
     root_->Cancel();
 }
 
-
 void WrenchMenu::Observe(int type,
                          const content::NotificationSource& source,
                          const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED:
       // A change in the global errors list can add or remove items from the
       // menu. Close the menu to avoid have a stale menu on-screen.
       root_->Cancel();
       break;
     default:
@@ skipping 48 matching lines @@
       case IDC_BOOKMARKS_MENU:
         DCHECK(!bookmark_menu_);
         bookmark_menu_ = item;
         break;
 
       case IDC_FEEDBACK:
         DCHECK(!feedback_menu_item_);
         feedback_menu_item_ = item;
         break;
 
+      case IDC_RECENT_TABS_MENU:
+        DCHECK(chrome::search::IsInstantExtendedAPIEnabled(
+            browser_->profile()));
+        DCHECK(!recent_tabs_menu_model_delegate_.get());
+        recent_tabs_menu_model_delegate_.reset(
+            new RecentTabsMenuModelDelegate(model->GetSubmenuModelAt(index),
+                                            item));
+        break;
+
       default:
         break;
     }
   }
 }
 
 MenuItemView* WrenchMenu::AppendMenuItem(MenuItemView* parent,
                                          MenuModel* model,
                                          int index,
                                          MenuModel::ItemType menu_type,
@@ skipping 53 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);
 }