summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 17:30:13 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-17 17:30:13 +0000
commit26300b881aeebb6739504731988b4c51204369ec (patch)
tree3c01b984e76391a875d74b6907d3db4b642edbf7 /chrome
parent3c21038e23d741ab88387f44db47b0faed1d75f3 (diff)
downloadchromium_src-26300b881aeebb6739504731988b4c51204369ec.zip
chromium_src-26300b881aeebb6739504731988b4c51204369ec.tar.gz
chromium_src-26300b881aeebb6739504731988b4c51204369ec.tar.bz2
Don't show "show in foloder" in chrome os.
BUG=chromiun-os:916 TEST=None Review URL: http://codereview.chromium.org/506045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/defaults.cc3
-rw-r--r--chrome/browser/defaults.h3
-rw-r--r--chrome/browser/dom_ui/downloads_ui.cc7
-rw-r--r--chrome/browser/resources/downloads.html20
4 files changed, 25 insertions, 8 deletions
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index ed99c9d..65f5802 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -21,7 +21,7 @@ const bool kShowImportOnBookmarkBar = false;
const bool kShowExitMenuItem = false;
const bool kShowAboutMenuItem = true;
const bool kOSSupportsOtherBrowsers = false;
-
+const bool kDownloadPageHasShowInFolder = false;
#elif defined(OS_LINUX)
// 13.4px = 10pt @ 96dpi.
@@ -49,6 +49,7 @@ const SessionStartupPref::Type kDefaultSessionStartupType =
const int kPinnedTabWidth = 56;
const bool kRestorePopups = false;
const bool kShowImportOnBookmarkBar = true;
+const bool kDownloadPageHasShowInFolder = true;
#if defined(OS_MACOSX)
const bool kShowExitMenuItem = false;
const bool kShowAboutMenuItem = false;
diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h
index 7ab5505..6478e14 100644
--- a/chrome/browser/defaults.h
+++ b/chrome/browser/defaults.h
@@ -54,6 +54,9 @@ extern const bool kShowAboutMenuItem;
// browser check are not done.
extern const bool kOSSupportsOtherBrowsers;
+// Does the download page have the show in folder option?
+extern const bool kDownloadPageHasShowInFolder;
+
} // namespace browser_defaults
#endif // CHROME_BROWSER_DEFAULTS_H_
diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc
index e74ed23..0a10bf3 100644
--- a/chrome/browser/dom_ui/downloads_ui.cc
+++ b/chrome/browser/dom_ui/downloads_ui.cc
@@ -11,6 +11,7 @@
#include "base/thread.h"
#include "base/values.h"
#include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/defaults.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
#include "chrome/browser/dom_ui/downloads_dom_handler.h"
#include "chrome/browser/download/download_manager.h"
@@ -85,8 +86,10 @@ void DownloadsUIHTMLSource::StartDataRequest(const std::string& path,
// Controls.
localized_strings.SetString(L"control_pause",
l10n_util::GetString(IDS_DOWNLOAD_LINK_PAUSE));
- localized_strings.SetString(L"control_showinfolder",
- l10n_util::GetString(IDS_DOWNLOAD_LINK_SHOW));
+ if (browser_defaults::kDownloadPageHasShowInFolder) {
+ localized_strings.SetString(L"control_showinfolder",
+ l10n_util::GetString(IDS_DOWNLOAD_LINK_SHOW));
+ }
localized_strings.SetString(L"control_cancel",
l10n_util::GetString(IDS_DOWNLOAD_LINK_CANCEL));
localized_strings.SetString(L"control_resume",
diff --git a/chrome/browser/resources/downloads.html b/chrome/browser/resources/downloads.html
index e5a4187..29f5020 100644
--- a/chrome/browser/resources/downloads.html
+++ b/chrome/browser/resources/downloads.html
@@ -382,9 +382,15 @@ function Download(download) {
this.nodeControls_ = createElementWithClassName('div', 'controls');
this.safe_.appendChild(this.nodeControls_);
- this.controlShow_ = createLink(bind(this.show_, this),
- localStrings.getString('control_showinfolder'));
- this.nodeControls_.appendChild(this.controlShow_);
+ // We don't need "show in folder" in chromium os. See download_ui.cc and
+ // http://code.google.com/p/chromium-os/issues/detail?id=916.
+ var showinfolder = localStrings.getString('control_showinfolder');
+ if (showinfolder) {
+ this.controlShow_ = createLink(bind(this.show_, this), showinfolder);
+ this.nodeControls_.appendChild(this.controlShow_);
+ } else {
+ this.controlShow_ = null;
+ }
// Pause/Resume are a toggle.
this.controlPause_ = createLink(bind(this.togglePause_, this),
@@ -518,7 +524,9 @@ Download.prototype.update = function(download) {
this.nodeProgressBackground_.style.display = 'none';
}
- showInline(this.controlShow_, this.state_ == Download.States.COMPLETE);
+ if (this.controlShow_) {
+ showInline(this.controlShow_, this.state_ == Download.States.COMPLETE);
+ }
showInline(this.controlPause_, this.state_ == Download.States.IN_PROGRESS);
showInline(this.controlResume_, this.state_ == Download.States.PAUSED);
showInline(this.controlCancel_, this.state_ == Download.States.IN_PROGRESS ||
@@ -540,7 +548,9 @@ Download.prototype.update = function(download) {
Download.prototype.clear = function() {
this.safe_.ondragstart = null;
this.nodeFileLink_.onclick = null;
- this.controlShow_.onclick = null;
+ if (this.controlShow_) {
+ this.controlShow_.onclick = null;
+ }
this.controlCancel_.onclick = null;
this.controlPause_.onclick = null;
this.controlResume_.onclick = null;