Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1047)

Unified Diff: chrome/browser/resources/file_manager/js/default_action_dialog.js

Issue 14619028: Merge 198613 "Files.app: Fixed the icon of image open item in de..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1500/src/
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/file_manager/js/default_action_dialog.js
===================================================================
--- chrome/browser/resources/file_manager/js/default_action_dialog.js (revision 199353)
+++ chrome/browser/resources/file_manager/js/default_action_dialog.js (working copy)
@@ -69,11 +69,11 @@
var div = this.document_.createElement('div');
div.textContent = item.label;
- if (item.iconType)
+ if (item.iconType) {
div.setAttribute('file-type-icon', item.iconType);
-
- if (item.iconUrl)
+ } else if (item.iconUrl) {
div.style.backgroundImage = 'url(' + item.iconUrl + ')';
+ }
if (item.class)
div.classList.add(item.class);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698