Added restore and add tab to the system menu so that these operations...

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-2009 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/views/frame/browser_view.h"
 
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/views/infobars/infobar_container.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/browser/views/new_profile_dialog.h"
 #include "chrome/browser/views/password_manager_view.h"
 #include "chrome/browser/views/select_profile_dialog.h"
 #include "chrome/browser/views/status_bubble_views.h"
 #include "chrome/browser/views/tab_contents_container_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/browser/views/toolbar_star_toggle.h"
 #include "chrome/browser/views/toolbar_view.h"
+#include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/os_exchange_data.h"
@@ skipping 63 matching lines @@
   { false, IDC_FIND, IDS_FIND },
   { true, 0, 0 },
   { false, IDC_PASTE, IDS_PASTE },
   { false, IDC_COPY, IDS_COPY },
   { false, IDC_CUT, IDS_CUT },
   { true, 0, 0 },
   { false, IDC_NEW_TAB, IDS_APP_MENU_NEW_WEB_PAGE },
   { false, IDC_SHOW_AS_TAB, IDS_SHOW_AS_TAB },
   { false, IDC_COPY_URL, IDS_APP_MENU_COPY_URL },
   { false, IDC_DUPLICATE_TAB, IDS_APP_MENU_DUPLICATE_APP_WINDOW },
+  { false, IDC_RESTORE_TAB, IDS_RESTORE_TAB },
   { true, 0, 0 },
   { false, IDC_RELOAD, IDS_APP_MENU_RELOAD },
   { false, IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD },
   { false, IDC_BACK, IDS_CONTENT_CONTEXT_BACK }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // ResizeCorner, private:
 
 class ResizeCorner : public views::View {
@@ skipping 275 matching lines @@
   }
   return otr_avatar_;
 }
 
 void BrowserView::PrepareToRunSystemMenu(HMENU menu) {
   for (int i = 0; i < arraysize(kMenuLayout); ++i) {
     int command = kMenuLayout[i].command;
     // |command| can be zero on submenu items (IDS_ENCODING,
     // IDS_ZOOM) and on separators.
     if (command != 0) {
-      system_menu_->EnableMenuItemByID(
-          command,
-          browser_->command_updater()->IsCommandEnabled(command));
+      bool enabled = browser_->command_updater()->IsCommandEnabled(command) &&
+        ((command != IDC_RESTORE_TAB) ||

[Glen Murphy, 2009/04/07 21:33:33]

I think this should be a four-pixel indent.

Though how about just splitting this into an if statement rather than bundling
it all up. My brain is slow.

+          !browser_->profile()->GetTabRestoreService()->entries().empty());
+      system_menu_->EnableMenuItemByID(command, enabled);
     }
   }
 }
 
 // static
 void BrowserView::RegisterBrowserViewPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kPluginMessageResponseTimeout,
                              kDefaultPluginMessageResponseTimeout);
   prefs->RegisterIntegerPref(prefs::kHungPluginDetectFrequency,
                              kDefaultHungPluginDetectFrequency);
@@ skipping 811 matching lines @@
 void BrowserView::InitSystemMenu() {
   HMENU system_menu = GetSystemMenu(frame_->GetNativeView(), FALSE);
   system_menu_.reset(new Menu(system_menu));
   int insertion_index = std::max(0, system_menu_->ItemCount() - 1);
   // We add the menu items in reverse order so that insertion_index never needs
   // to change.
   if (IsBrowserTypeNormal()) {
     system_menu_->AddSeparator(insertion_index);
     system_menu_->AddMenuItemWithLabel(insertion_index, IDC_TASK_MANAGER,
                                        l10n_util::GetString(IDS_TASK_MANAGER));
+    system_menu_->AddSeparator(insertion_index);
+    system_menu_->AddMenuItemWithLabel(insertion_index, IDC_RESTORE_TAB,
+                                       l10n_util::GetString(IDS_RESTORE_TAB));
+    system_menu_->AddMenuItemWithLabel(insertion_index, IDC_NEW_TAB,
+                                       l10n_util::GetString(IDS_NEW_TAB));
     // If it's a regular browser window with tabs, we don't add any more items,
     // since it already has menus (Page, Chrome).
   } else {
     BuildMenuForTabStriplessWindow(system_menu_.get(), insertion_index);
   }
 }
 
 int BrowserView::LayoutTabStrip() {
   gfx::Rect tabstrip_bounds = frame_->GetBoundsForTabStrip(tabstrip_);
   gfx::Point tabstrip_origin = tabstrip_bounds.origin();
@@ skipping 336 matching lines @@
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserView* browser_view = new BrowserView(browser);
   (new BrowserFrame(browser_view))->Init();
   return browser_view;
 }
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return new FindBarWin(static_cast<BrowserView*>(browser->window()));
 }