diff options
| author | hirono@chromium.org <hirono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 03:54:07 +0000 |
|---|---|---|
| committer | hirono@chromium.org <hirono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-07 03:54:07 +0000 |
| commit | f4d7b90d35f4c8058fe2d461f69da5f0effd09c6 (patch) | |
| tree | de6e29e3ca2920b9d49b26a7bdeb344d8a137b63 | |
| parent | 8eeb037a27699700edc62d9e38bb82c211f11d0b (diff) | |
| download | chromium_src-f4d7b90d35f4c8058fe2d461f69da5f0effd09c6.zip chromium_src-f4d7b90d35f4c8058fe2d461f69da5f0effd09c6.tar.gz chromium_src-f4d7b90d35f4c8058fe2d461f69da5f0effd09c6.tar.bz2 | |
Files.app: Fixed the icon of image open item in default action dialog
Originally, if a task item has both 'iconType' and 'iconUrl' properties,
'iconType' is used in the tasks menu and
'iconUrl' is used in the default action dialog.
This CL fixed the priority for default action dialog so that both
priorities are same.
BUG=237153
TEST=Open 'default action dialog' and check the icon.
Review URL: https://chromiumcodereview.appspot.com/14589007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198613 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/file_manager/js/default_action_dialog.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/resources/file_manager/js/default_action_dialog.js b/chrome/browser/resources/file_manager/js/default_action_dialog.js index f84a6ea..55ed02e 100644 --- a/chrome/browser/resources/file_manager/js/default_action_dialog.js +++ b/chrome/browser/resources/file_manager/js/default_action_dialog.js @@ -69,11 +69,11 @@ cr.define('cr.filebrowser', function() { 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); |