Introduces an additional extension loader that load extra extensions based on per-extension json fi…

chrome/browser/extensions/external_pref_extension_loader.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTERNAL_PREF_EXTENSION_LOADER_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTERNAL_PREF_EXTENSION_LOADER_H_
 #pragma once
 
 #include "chrome/browser/extensions/external_extension_loader.h"
 
@@ skipping 11 matching lines @@
  public:
   enum Options {
     NONE = 0,
 
     // Ensure that only root can force an external install by checking
     // that all components of the path to external extensions files are
     // owned by root and not writable by any non-root user.
     ENSURE_PATH_CONTROLLED_BY_ADMIN = 1 << 0
   };
 
-  // |base_path_key| is the directory containing the external_extensions.json
-  // file.  Relative file paths to extension files are resolved relative
-  // to this path.
-  explicit ExternalPrefExtensionLoader(int base_path_key, Options options);
+  // |base_path_id| is the directory containing the external_extensions.json
+  // file or the standalone extension manifest files. Relative file paths to
+  // extension files are resolved relative to this path.
+  explicit ExternalPrefExtensionLoader(int base_path_id, Options options);
 
   virtual const FilePath GetBaseCrxFilePath() OVERRIDE;
 
  protected:
   virtual void StartLoading() OVERRIDE;
   bool IsOptionSet(Options option) {
     return (options_ & option) != 0;
   }
 
  private:
   friend class base::RefCountedThreadSafe<ExternalExtensionLoader>;
 
   virtual ~ExternalPrefExtensionLoader() {}
 
-  DictionaryValue* ReadJsonPrefsFile();
+  // Actually searches for and loads candidate standalone extension preference
+  // files in the path corresponding to |base_path_id|.
+  // Must be called on the file thread.
   void LoadOnFileThread();
 
-  int base_path_key_;
+  // Extracts the information contained in a external_extension.json file

[Finnur, 2012/04/27 14:29:43]

nit: a -> an (I missed that last time)

[Alexandre Abreu, 2012/04/27 14:46:52]

Done.

+  // regarding which extensions to install. |prefs| will be modified to
+  // receive the extracted extension information.
+  // Must be called from the File thread.
+  void ReadExternalExtensionPrefFile(DictionaryValue * prefs);
+
+  // Extracts the information contained in standalone external extension
+  // json files (<extension id>.json) regarding what external extensions
+  // to install. |prefs| will be modified to receive the extracted extension
+  // information.
+  // Must be called from the File thread.
+  void ReadStandaloneExtensionPrefFiles(DictionaryValue * prefs);
+
+  // The resource id of the base path with the information about the json
+  // file containing which extensions to load.
+  int base_path_id_;
+
   Options options_;
+
+  // The path (coresponding to |base_path_id_| containing the json files
+  // describing which extensions to load.
   FilePath base_path_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalPrefExtensionLoader);
 };
 
 // A simplified version of ExternalPrefExtensionLoader that loads the dictionary
 // from json data specified in a string.
 class ExternalTestingExtensionLoader : public ExternalExtensionLoader {
  public:
   ExternalTestingExtensionLoader(
@@ skipping 10 matching lines @@
 
   virtual ~ExternalTestingExtensionLoader();
 
   FilePath fake_base_path_;
   scoped_ptr<DictionaryValue> testing_prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalTestingExtensionLoader);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTERNAL_PREF_EXTENSION_LOADER_H_