summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authoryawano <yawano@chromium.org>2014-12-09 19:06:32 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-10 03:06:54 +0000
commitc0344cbb2a4d93eadcc04d1c53f30b488bffe03f (patch)
tree3666c4c7940e6ee9f4a23aa30763f7c4d0b8009b /ui
parentf5b793e7b144126ca5b8dd69e6d399cd6bf90181 (diff)
downloadchromium_src-c0344cbb2a4d93eadcc04d1c53f30b488bffe03f.zip
chromium_src-c0344cbb2a4d93eadcc04d1c53f30b488bffe03f.tar.gz
chromium_src-c0344cbb2a4d93eadcc04d1c53f30b488bffe03f.tar.bz2
Show all non-generic file handlers as "Open" in file tasks combobutton.
This CL changes text of file tasks combobutton to "Open" for any non-generic file handlers (file handlers which take specific file types such as: ["jpg"]). BUG=430368 TEST=Manually tested Review URL: https://codereview.chromium.org/793543002 Cr-Commit-Position: refs/heads/master@{#307628}
Diffstat (limited to 'ui')
-rw-r--r--ui/file_manager/file_manager/foreground/js/file_tasks.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/ui/file_manager/file_manager/foreground/js/file_tasks.js b/ui/file_manager/file_manager/foreground/js/file_tasks.js
index 031baff..fdd285e 100644
--- a/ui/file_manager/file_manager/foreground/js/file_tasks.js
+++ b/ui/file_manager/file_manager/foreground/js/file_tasks.js
@@ -649,12 +649,8 @@ FileTasks.prototype.display_ = function(combobutton) {
// If there exist defaultTask show it on the combobutton.
if (this.defaultTask_) {
- if (this.defaultTask_.taskId === FileTasks.ZIP_UNPACKER_TASK_ID) {
- combobutton.defaultItem = this.createCombobuttonItem_(this.defaultTask_,
- str('ACTION_OPEN'));
- } else {
- combobutton.defaultItem = this.createCombobuttonItem_(this.defaultTask_);
- }
+ combobutton.defaultItem = this.createCombobuttonItem_(this.defaultTask_,
+ str('ACTION_OPEN'));
} else {
combobutton.defaultItem = {
label: loadTimeData.getString('MORE_ACTIONS')