hook up history and download menu items

Small fix to get them to display (need to include webkit strings in our
language pak files).

Review URL: http://codereview.chromium.org/39296


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11286 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 16 insertions, 17 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 13c202f..4e21329 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -14,6 +14,8 @@
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/character_encoding.h"
+#include "chrome/browser/dom_ui/downloads_ui.h"
+#include "chrome/browser/dom_ui/history_ui.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ -59,8 +61,6 @@
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/debugger/debugger_window.h"
 #include "chrome/browser/dock_info.h"
-#include "chrome/browser/dom_ui/downloads_ui.h"
-#include "chrome/browser/dom_ui/history_ui.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
@@ -979,21 +979,23 @@ void Browser::ToggleBookmarkBar() {
   window_->ToggleBookmarkBar();
 }
 
-void Browser::ShowHistoryTab() {
-  UserMetrics::RecordAction(L"ShowHistory", profile_);
-  ShowSingleDOMUITab(HistoryUI::GetBaseURL());
-}
-
 void Browser::OpenBookmarkManager() {
   UserMetrics::RecordAction(L"ShowBookmarkManager", profile_);
   window_->ShowBookmarkManager();
 }
+#endif  // #if defined(OS_WIN)
+
+void Browser::ShowHistoryTab() {
+  UserMetrics::RecordAction(L"ShowHistory", profile_);
+  ShowSingleDOMUITab(HistoryUI::GetBaseURL());
+}
 
 void Browser::ShowDownloadsTab() {
   UserMetrics::RecordAction(L"ShowDownloads", profile_);
   ShowSingleDOMUITab(DownloadsUI::GetBaseURL());
 }
 
+#if defined(OS_WIN)
 void Browser::OpenClearBrowsingDataDialog() {
   UserMetrics::RecordAction(L"ClearBrowsingData_ShowDlg", profile_);
   window_->ShowClearBrowsingDataDialog();
@@ -1216,9 +1218,11 @@ void Browser::ExecuteCommand(int id) {
     case IDC_NEW_PROFILE:           OpenNewProfileDialog();        break;
     case IDC_REPORT_BUG:            OpenBugReportDialog();         break;
     case IDC_SHOW_BOOKMARK_BAR:     ToggleBookmarkBar();           break;
-    case IDC_SHOW_HISTORY:          ShowHistoryTab();              break;
     case IDC_SHOW_BOOKMARK_MANAGER: OpenBookmarkManager();         break;
+#endif
+    case IDC_SHOW_HISTORY:          ShowHistoryTab();              break;
     case IDC_SHOW_DOWNLOADS:        ShowDownloadsTab();            break;
+#if defined(OS_WIN)
 #ifdef CHROME_PERSONALIZATION
     case IDC_P13N_INFO:
       Personalization::HandleMenuItemClick(profile());             break;
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 920a488..5efbec8 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -264,9 +264,6 @@ class Browser : public TabStripModelDelegate,
   void SavePage();
   void ViewSource();
 
-  // Show various bits of UI.
-  void ShowDownloadsTab();
-
   // Returns true if the Browser supports the specified feature.
   bool SupportsWindowFeature(WindowFeature feature) const;
 
@@ -313,8 +310,11 @@ class Browser : public TabStripModelDelegate,
   void OpenNewProfileDialog();
   void OpenBugReportDialog();
   void ToggleBookmarkBar();
-  void ShowHistoryTab();
   void OpenBookmarkManager();
+#endif
+  void ShowHistoryTab();
+  void ShowDownloadsTab();
+#if defined(OS_WIN)
   void OpenClearBrowsingDataDialog();
   void OpenImportSettingsDialog();
   void OpenOptionsDialog();
diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc
index 3feca71..9003a21 100644
--- a/chrome/browser/download/download_shelf.cc
+++ b/chrome/browser/download/download_shelf.cc
@@ -22,17 +22,12 @@
 // DownloadShelf ---------------------------------------------------------------
 
 void DownloadShelf::ShowAllDownloads() {
-#if defined(OS_WIN)
   Profile* profile = tab_contents_->profile();
   if (profile)
     UserMetrics::RecordAction(L"ShowDownloads", profile);
   GURL url = DownloadsUI::GetBaseURL();
   tab_contents_->OpenURL(url, GURL(), NEW_FOREGROUND_TAB,
       PageTransition::AUTO_BOOKMARK);
-#else
-  // TODO(port): After we port DownloadsUI, enable this function.
-  NOTIMPLEMENTED();
-#endif
 }
 
 void DownloadShelf::ChangeTabContents(TabContents* old_contents,