Gallery.app: Replace the existing gallery with the new separated gallery.

chrome/browser/extensions/component_loader.cc

 // 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.
 
 #include "chrome/browser/extensions/component_loader.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 278 matching lines @@
 }
 
 void ComponentLoader::AddVideoPlayerExtension() {
 #if defined(OS_CHROMEOS)
   Add(IDR_VIDEO_PLAYER_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("video_player")));
 #endif  // defined(OS_CHROMEOS)
 }
 
 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() {
 #if defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTENSION)
   Add(IDR_HANGOUT_SERVICES_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("hangout_services")));
 #endif
 }
 
 void ComponentLoader::AddHotwordHelperExtension() {
@@ skipping 314 matching lines @@
         off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
     fileapi::FileSystemContext* file_system_context =
         content::BrowserContext::GetStoragePartitionForSite(
             off_the_record_context, site)->GetFileSystemContext();
     file_system_context->EnableTemporaryFileSystemInIncognito();
   }
 #endif
 }
 
 }  // namespace extensions