Added Undo close window to menu. Standardized capitalization for ...

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 456 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) {
       bool enabled = browser_->command_updater()->IsCommandEnabled(command);
-      if (enabled && command == IDC_RESTORE_TAB)
-        enabled = browser_->profile()->GetTabRestoreService() &&
-            !browser_->profile()->GetTabRestoreService()->entries().empty();
+      if (enabled && command == IDC_RESTORE_TAB) {
+        TabRestoreService* tab_restore_service =
+          browser_->profile()->GetTabRestoreService();
+        if (tab_restore_service && !tab_restore_service->entries().empty()) {
+          system_menu_->SetMenuLabel(command, l10n_util::GetString(
+              tab_restore_service->entries().front()->type ==
+              TabRestoreService::WINDOW ? IDS_RESTORE_WINDOW :
+              IDS_RESTORE_TAB));
+        } else {
+          enabled = false;
+        }
+      }
       system_menu_->EnableMenuItemByID(command, enabled);
     }
   }
 }
 
 // static
 void BrowserView::RegisterBrowserViewPrefs(PrefService* prefs) {
   prefs->RegisterIntegerPref(prefs::kPluginMessageResponseTimeout,
                              kDefaultPluginMessageResponseTimeout);
   prefs->RegisterIntegerPref(prefs::kHungPluginDetectFrequency,
@@ skipping 1134 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()));
 }