Index: chrome/browser/resources/file_manager/js/file_manager.js |
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js |
index c610e4520e0e4453b96911b242b5ecd4d4bf066b..7fdbe71894febeaac0d5623335a5252d1e2f9c0b 100644 |
--- a/chrome/browser/resources/file_manager/js/file_manager.js |
+++ b/chrome/browser/resources/file_manager/js/file_manager.js |
@@ -4183,24 +4183,35 @@ FileManager.prototype = { |
str('GDATA_FAILED_SPACE_INFO'); |
} |
}.bind(this)); |
- } |
+ }; |
/** |
* Updates default action menu item to match passed taskItem(icon, |
* label and action). |
* @param {Object} taskItem - taskItem to match. |
*/ |
- FileManager.prototype.setDefaultActionMenuItem = function(taskItem) { |
- if (taskItem) { |
- this.defaultActionMenuItem_.iconUrl = taskItem.iconUrl; |
- this.defaultActionMenuItem_.label = taskItem.title; |
- this.defaultActionMenuItem_.taskId = taskItem.taskId; |
+ FileManager.prototype.setDefaultActionMenuItem = function(defaultItem) { |
+ if (defaultItem) { |
+ |
+ if (defaultItem.iconType) { |
+ this.defaultActionMenuItem_.style.backgroundImage = ''; |
+ this.defaultActionMenuItem_.setAttribute('file-type-icon', |
+ defaultItem.iconType); |
+ } else if (defaultItem.iconUrl) { |
+ this.defaultActionMenuItem_.style.backgroundImage = |
+ 'url(' + defaultItem.iconUrl + ')'; |
+ } else { |
+ this.actionNode_.style.backgroundImage = ''; |
dgozman
2012/08/27 13:07:10
actionNode_ ?
|
+ } |
+ |
+ this.defaultActionMenuItem_.label = defaultItem.title; |
+ this.defaultActionMenuItem_.taskId = defaultItem.taskId; |
} |
var defaultActionSeparator = |
this.dialogDom_.querySelector('#default-action-separator'); |
- this.defaultActionMenuItem_.hidden = !taskItem; |
- defaultActionSeparator.hidden = !taskItem; |
- } |
+ this.defaultActionMenuItem_.hidden = !defaultItem; |
+ defaultActionSeparator.hidden = !defaultItem; |
+ }; |
})(); |