Index: chrome/browser/extensions/external_pref_extension_loader.h |
=================================================================== |
--- chrome/browser/extensions/external_pref_extension_loader.h (revision 133542) |
+++ chrome/browser/extensions/external_pref_extension_loader.h (working copy) |
@@ -29,10 +29,10 @@ |
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; |
@@ -47,11 +47,35 @@ |
virtual ~ExternalPrefExtensionLoader() {} |
- DictionaryValue* ReadJsonPrefsFile(); |
+ // Actually searches for and loads candidate standalone extension preference |
+ // files in the path corresponding to |base_path_id|. |
+ // Must be dispatched/called on the file thread. |
Finnur
2012/04/27 10:50:28
nit: Drop the word dispatched.
Alexandre Abreu
2012/04/27 14:05:40
Done.
|
void LoadOnFileThread(); |
- int base_path_key_; |
+ // Tries to read and extract the information contained in a |
Finnur
2012/04/27 10:50:28
Suggest: s/Tries to read and extract/Extracts/.
Alexandre Abreu
2012/04/27 14:05:40
Done.
|
+ // external_extension.json file. |
Finnur
2012/04/27 10:50:28
Add: ... regarding what external extensions to ins
Alexandre Abreu
2012/04/27 14:05:40
Done.
|
+ // |prefs| will be modified to receive the extracted extension |
Finnur
2012/04/27 10:50:28
Nit: Merge this with line 56 (don't add a linebrea
Alexandre Abreu
2012/04/27 14:05:40
Done.
|
+ // information. |
+ // Must be called from the File thread. |
+ void ReadExternalExtensionPrefFile(DictionaryValue * prefs); |
+ |
+ // Tries to read and extract the information contained in |
Finnur
2012/04/27 10:50:28
Suggest: s/Tries to read and extract/Extracts/.
Alexandre Abreu
2012/04/27 14:05:40
Done.
|
+ // standalone external extension json files whose name follow the |
+ // following pattern: |
+ // <extension id>.json |
Finnur
2012/04/27 10:50:28
Suggest: ... contained in standalone external exte
Alexandre Abreu
2012/04/27 14:05:40
Done.
|
+ // |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 containing the json file containing |
Finnur
2012/04/27 10:50:28
Second 'containing' should be 'with the informatio
Alexandre Abreu
2012/04/27 14:05:40
Done.
|
+ // 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); |