Merge 198613 "Files.app: Fixed the icon of image open item in de..."

chrome/browser/resources/file_manager/js/default_action_dialog.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 
 /**
  * DefaultActionDialog contains a message, a list box, an ok button, and a
  * cancel button.
@@ skipping 51 matching lines @@
   /**
    * Renders item for list.
    * @param {Object} item Item to render.
    */
   DefaultActionDialog.prototype.renderItem = function(item) {
     var result = this.document_.createElement('li');
 
     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);
 
     result.appendChild(div);
 
     cr.defineProperty(result, 'lead', cr.PropertyKind.BOOL_ATTR);
     cr.defineProperty(result, 'selected', cr.PropertyKind.BOOL_ATTR);
 
     return result;
@@ skipping 57 matching lines @@
       this.onCancelClick_(event);
       event.preventDefault();
     } else if (event.keyCode == 32 || event.keyCode == 13) {
       this.onOkClick_();
       event.preventDefault();
     }
   };
 
   return {DefaultActionDialog: DefaultActionDialog};
 });