diff options
| author | kinaba <kinaba@chromium.org> | 2014-10-30 23:53:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-31 06:53:44 +0000 |
| commit | e67a5643c6656ecd0347a7cc42371e124fde323d (patch) | |
| tree | f4c7c5e9d32e6979ff5d49bcb487d0785d5d6b10 /ui/file_manager | |
| parent | 5fab0631cf446beb6a2f749b91a07637a53afea8 (diff) | |
| download | chromium_src-e67a5643c6656ecd0347a7cc42371e124fde323d.zip chromium_src-e67a5643c6656ecd0347a7cc42371e124fde323d.tar.gz chromium_src-e67a5643c6656ecd0347a7cc42371e124fde323d.tar.bz2 | |
Files.app: Use the same file type associates as Windows on HTML files.
This CL associates .xhtm, .xhtml, and .shtml to the browser window.
The list matches what Chrome handles on Windows, enumerated at
src/chrome/installer/util/shell_util.cc#kDefaultFileAssociations.
BUG=427542
Review URL: https://codereview.chromium.org/693103003
Cr-Commit-Position: refs/heads/master@{#302235}
Diffstat (limited to 'ui/file_manager')
| -rw-r--r-- | ui/file_manager/file_manager/foreground/js/file_type.js | 2 | ||||
| -rw-r--r-- | ui/file_manager/file_manager/manifest.json | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ui/file_manager/file_manager/foreground/js/file_type.js b/ui/file_manager/file_manager/foreground/js/file_type.js index f82a3d1..b795728 100644 --- a/ui/file_manager/file_manager/foreground/js/file_type.js +++ b/ui/file_manager/file_manager/foreground/js/file_type.js @@ -163,7 +163,7 @@ FileType.types = [ }, { type: 'document', name: 'HTML_DOCUMENT_FILE_TYPE', - subtype: 'HTML', pattern: /\.(html?|mht|mhtml)$/i + subtype: 'HTML', pattern: /\.(html?|mht(ml)?|shtml|xht(ml)?)$/i }, { type: 'document', icon: 'word', name: 'WORD_DOCUMENT_FILE_TYPE', diff --git a/ui/file_manager/file_manager/manifest.json b/ui/file_manager/file_manager/manifest.json index 818dce3..c20051d7 100644 --- a/ui/file_manager/file_manager/manifest.json +++ b/ui/file_manager/file_manager/manifest.json @@ -75,6 +75,9 @@ "filesystem:*.html", "filesystem:*.mht", "filesystem:*.mhtml", + "filesystem:*.shtml", + "filesystem:*.xht", + "filesystem:*.xhtml", "filesystem:*.svg", "filesystem:*.txt" ] |