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>
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/search/search_model.h"
+#include "chrome/browser/ui/toolbar/recent_tabs_menu_model_delegate.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
@@ skipping 719 matching lines @@
   if (menu_runner_->RunMenuAt(host->GetWidget(), host, bounds,
           MenuItemView::TOPRIGHT, views::MenuRunner::HAS_MNEMONICS) ==
       views::MenuRunner::MENU_DELETED)
     return;
   if (bookmark_menu_delegate_.get()) {
     BookmarkModel* model = BookmarkModelFactory::GetForProfile(
         browser_->profile());
     if (model)
       model->RemoveObserver(this);
   }
+  recent_tabs_menu_model_delegate_.reset();

[sky, 2012/11/07 00:10:47]

Is there a reason to explicitly destroy this here?

[kuan, 2012/11/07 02:29:46]

the only reason is wherever we stop observing bookmark model, i do the same
thing for recent tabs by resetting the delegate.  is this wrong?

[sky, 2012/11/07 14:40:12]

But your code doesn't need to be cleaned up explicitly right? Running the
destructor and destroying the scoped_ptr should do the right thing.

[kuan, 2012/11/07 16:48:52]

Done.

   if (selected_menu_model_)
     selected_menu_model_->ActivatedAt(selected_index_);
 }
 
 bool WrenchMenu::IsShowing() {
   return menu_runner_.get() && menu_runner_->IsRunning();
 }
 
 string16 WrenchMenu::GetTooltipText(int id,
                                     const gfx::Point& p) const {
@@ skipping 114 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 50 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 54 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);
 }