summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-09 20:56:36 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-09 20:56:36 +0000
commit8bf80e9295fcc8166e103d3f4a5d1947619c525c (patch)
tree070fc49d589f72189f6f9318fd3acf94d75f407f /chrome/browser/browser.cc
parent5c2b98bd412b23db58345799a625b406b858ad4f (diff)
downloadchromium_src-8bf80e9295fcc8166e103d3f4a5d1947619c525c.zip
chromium_src-8bf80e9295fcc8166e103d3f4a5d1947619c525c.tar.gz
chromium_src-8bf80e9295fcc8166e103d3f4a5d1947619c525c.tar.bz2
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
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc20
1 files changed, 12 insertions, 8 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;