Provide script/gypi support for manifest generation

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 311 matching lines @@
 #endif  // defined(IMAGE_LOADER_EXTENSION)
 }
 
 void ComponentLoader::AddNetworkSpeechSynthesisExtension() {
   Add(IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("network_speech_synthesis")));
 }
 
 #if defined(OS_CHROMEOS)
 std::string ComponentLoader::AddChromeVoxExtension() {
+  base::FilePath chromevox_path;
+  PathService::Get(chrome::DIR_RESOURCES, &chromevox_path);
+  chromevox_path =
+      chromevox_path.Append(extension_misc::kChromeVoxExtensionPath);
+
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  int idr = command_line->HasSwitch(chromeos::switches::kGuestSession) ?
-      IDR_CHROMEVOX_GUEST_MANIFEST : IDR_CHROMEVOX_MANIFEST;
+  const char* manifest_filename =
+      command_line->HasSwitch(chromeos::switches::kGuestSession) ?
+      extension_misc::kChromeVoxGuestManifestFilename :
+          extension_misc::kChromeVoxManifestFilename;
 
-  // TODO(dtseng): Guest mode manifest for ChromeVox Next pending work to
-  // generate manifests.
-  if (command_line->HasSwitch(chromeos::switches::kEnableChromeVoxNext))
-    idr = IDR_CHROMEVOX2_MANIFEST;
-  return Add(idr, base::FilePath(extension_misc::kChromeVoxExtensionPath));
+  std::string error;
+  scoped_ptr<base::DictionaryValue> manifest(
+      file_util::LoadManifest(chromevox_path, manifest_filename, &error));
+  CHECK(manifest) << error;
+
+  return Add(manifest.release(), chromevox_path);
 }
 
 std::string ComponentLoader::AddChromeOsSpeechSynthesisExtension() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   int idr = command_line->HasSwitch(chromeos::switches::kGuestSession) ?
       IDR_SPEECH_SYNTHESIS_GUEST_MANIFEST : IDR_SPEECH_SYNTHESIS_MANIFEST;
   std::string id = Add(idr,
       base::FilePath(extension_misc::kSpeechSynthesisExtensionPath));
   EnableFileSystemInGuestMode(id);
   return id;
@@ skipping 268 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