Gallery.app: Add empty place holders for new separated Gallery app.

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 274 matching lines @@
   Add(IDR_FILEMANAGER_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("file_manager")));
 #endif  // defined(OS_CHROMEOS)
 }
 
 void ComponentLoader::AddVideoPlayerExtension() {
   Add(IDR_VIDEOPLAYER_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("video_player")));
 }
 
+void ComponentLoader::AddGalleryExtension() {
+#if defined(OS_CHROMEOS)
+  const CommandLine* const command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(chromeos::switches::kFileManagerEnableNewGallery))
+    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() {
   if (HotwordServiceFactory::IsHotwordAllowed(browser_context_)) {
     Add(IDR_HOTWORD_HELPER_MANIFEST,
@@ skipping 130 matching lines @@
 
 void ComponentLoader::AddDefaultComponentExtensionsForKioskMode(
     bool skip_session_components) {
   // No component extension for kiosk app launch splash screen.
   if (skip_session_components)
     return;
 
   // Component extensions needed for kiosk apps.
   AddVideoPlayerExtension();
   AddFileManagerExtension();
+  AddGalleryExtension();
 
   // Add virtual keyboard.
   AddKeyboardApp();
 }
 
 void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
     bool skip_session_components) {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   // Component extensions with background pages are not enabled during tests
@@ skipping 11 matching lines @@
     AddWithName(IDR_GENIUS_APP_MANIFEST,
                 base::FilePath(FILE_PATH_LITERAL(
                     "/usr/share/chromeos-assets/genius_app")),
                 l10n_util::GetStringUTF8(IDS_GENIUS_APP_NAME));
   }
 #endif
 
   if (!skip_session_components) {
     AddVideoPlayerExtension();
     AddFileManagerExtension();
+    AddGalleryExtension();
 
     AddHangoutServicesExtension();
     AddHotwordHelperExtension();
     AddImageLoaderExtension();
 
 #if defined(ENABLE_SETTINGS_APP)
     Add(IDR_SETTINGS_APP_MANIFEST,
         base::FilePath(FILE_PATH_LITERAL("settings_app")));
 #endif
   }
@@ skipping 129 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