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 /chrome/browser/extensions/component_loader.cc | |
| 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 'chrome/browser/extensions/component_loader.cc')
| -rw-r--r-- | chrome/browser/extensions/component_loader.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 99129d8..bad3962 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -296,7 +296,9 @@ void ComponentLoader::AddVideoPlayerExtension() { } void ComponentLoader::AddGalleryExtension() { - // TODO(hirono): Disable the new experimental gallery in M36 temporarily. +#if defined(OS_CHROMEOS) + Add(IDR_GALLERY_MANIFEST, base::FilePath(FILE_PATH_LITERAL("gallery"))); +#endif } void ComponentLoader::AddHangoutServicesExtension() { |