diff options
| author | hirono@chromium.org <hirono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 02:53:17 +0000 |
|---|---|---|
| committer | hirono@chromium.org <hirono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-20 02:53:17 +0000 |
| commit | 00ac53efb22f9a6909dac0b4c72bab72571abaec (patch) | |
| tree | b843e8ff4a47b2da482475d9c170bdebe746da61 /ui/file_manager | |
| parent | 1593e8ebecb05bd9747aa0f0eafbcd4d04176853 (diff) | |
| download | chromium_src-00ac53efb22f9a6909dac0b4c72bab72571abaec.zip chromium_src-00ac53efb22f9a6909dac0b4c72bab72571abaec.tar.gz chromium_src-00ac53efb22f9a6909dac0b4c72bab72571abaec.tar.bz2 | |
Gallery.app: Replace the existing gallery with the new separated gallery.
This CL starts to use the new separated gallery without specifying the
file-manager-enable-new-gallery flag.
BUG=358698
TEST=none
Review URL: https://codereview.chromium.org/285373015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271546 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/file_manager')
| -rw-r--r-- | ui/file_manager/file_manager/manifest.json | 15 | ||||
| -rw-r--r-- | ui/file_manager/gallery/manifest.json | 4 |
2 files changed, 2 insertions, 17 deletions
diff --git a/ui/file_manager/file_manager/manifest.json b/ui/file_manager/file_manager/manifest.json index cc6f571..89df0c4 100644 --- a/ui/file_manager/file_manager/manifest.json +++ b/ui/file_manager/file_manager/manifest.json @@ -95,21 +95,6 @@ ] }, { - "id": "gallery", - "default_title": "__MSG_OPEN_ACTION__", - "default_icon": "common/images/file_types/200/image.png", - "file_filters": [ - // Image formats - "filesystem:*.bmp", - "filesystem:*.gif", - "filesystem:*.ico", - "filesystem:*.jpg", - "filesystem:*.jpeg", - "filesystem:*.png", - "filesystem:*.webp" - ] - }, - { "id": "gallery-video", "default_title": "__MSG_OPEN_ACTION__", "default_icon": "common/images/file_types/200/image.png", diff --git a/ui/file_manager/gallery/manifest.json b/ui/file_manager/gallery/manifest.json index 0d9dd18..5f90a56 100644 --- a/ui/file_manager/gallery/manifest.json +++ b/ui/file_manager/gallery/manifest.json @@ -25,7 +25,7 @@ "chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj" ], "file_handlers": { - "video": { + "image": { "types": [ "image/*" ], @@ -39,7 +39,7 @@ "webp" ], // TODO(hirono): Rename and localize this. - "title": "Open in new Gallery" + "title": "Open" } }, "app": { |