Chromium Code Reviews| Index: chrome/browser/extensions/convert_user_script.cc |
| diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc |
| index 4531ef09e990ffd937a4732847613d3dc61b07c0..7bd9622af094601b3d81656bad2ded752010a689 100644 |
| --- a/chrome/browser/extensions/convert_user_script.cc |
| +++ b/chrome/browser/extensions/convert_user_script.cc |
| @@ -31,7 +31,7 @@ namespace extensions { |
| scoped_refptr<Extension> ConvertUserScriptToExtension( |
| const FilePath& user_script_path, const GURL& original_url, |
| - string16* error) { |
| + const FilePath& all_extensions_dir, string16* error) { |
| std::string content; |
| if (!file_util::ReadFileToString(user_script_path, &content)) { |
| *error = ASCIIToUTF16("Could not read source file."); |
| @@ -50,14 +50,15 @@ scoped_refptr<Extension> ConvertUserScriptToExtension( |
| return NULL; |
| } |
| - FilePath user_data_temp_dir = extension_file_util::GetUserDataTempDir(); |
| - if (user_data_temp_dir.empty()) { |
| + FilePath extensions_temp_dir = |
| + extension_file_util::GetExtensionsTempDir(all_extensions_dir); |
|
Aaron Boodman
2012/10/18 21:11:12
GetInstallTempDir? GetTempInstallDir?
|
| + if (extensions_temp_dir.empty()) { |
| *error = ASCIIToUTF16("Could not get path to profile temporary directory."); |
| return NULL; |
| } |
| ScopedTempDir temp_dir; |
| - if (!temp_dir.CreateUniqueTempDirUnderPath(user_data_temp_dir)) { |
| + if (!temp_dir.CreateUniqueTempDirUnderPath(extensions_temp_dir)) { |
| *error = ASCIIToUTF16("Could not create temporary directory."); |
| return NULL; |
| } |