summaryrefslogtreecommitdiffstats
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
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
-rw-r--r--chrome/app/chrome_strings.scons5
-rw-r--r--chrome/browser/browser.cc20
-rw-r--r--chrome/browser/browser.h8
-rw-r--r--chrome/browser/download/download_shelf.cc5
-rw-r--r--chrome/common/temp_scaffolding_stubs.h8
5 files changed, 19 insertions, 27 deletions
diff --git a/chrome/app/chrome_strings.scons b/chrome/app/chrome_strings.scons
index b4e6fa1..605ee97 100644
--- a/chrome/app/chrome_strings.scons
+++ b/chrome/app/chrome_strings.scons
@@ -32,9 +32,10 @@ languages = [ 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en-GB',
# chromium builds only.
for lang in languages:
lang_pak = env.Repack('$TARGET_ROOT/locales/%s.pak' % lang,
- ['$TARGET_ROOT/grit_derived_sources/generated_resources_%s.pak' % lang,
- '$TARGET_ROOT/grit_derived_sources/chromium_strings_%s.pak' % lang,
+ ['$TARGET_ROOT/grit_derived_sources/chromium_strings_%s.pak' % lang,
+ '$TARGET_ROOT/grit_derived_sources/generated_resources_%s.pak' % lang,
'$TARGET_ROOT/grit_derived_sources/locale_settings_%s.pak' % lang,
+ '$TARGET_ROOT/grit_derived_sources/webkit_strings_%s.pak' % lang,
]
)
i = env.Install('$DESTINATION_ROOT/locales', lang_pak)
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,
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 83dbc74..8583aae 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -759,14 +759,6 @@ class FontsLanguagesWindowView {
void SelectLanguagesTab() { NOTIMPLEMENTED(); }
};
-class HistoryTabUI {
- public:
- static const GURL GetHistoryURLWithSearchText(const std::wstring& text) {
- NOTIMPLEMENTED();
- return GURL();
- }
-};
-
class OSExchangeData {
public:
void SetString(const std::wstring& data) { NOTIMPLEMENTED(); }
generated by cgit v1.1 at 2025-03-10 18:55:53 +0000