Chromium Code Reviews| Index: chrome/browser/extensions/sandboxed_unpacker.cc |
| diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc |
| index e2b317f48871546bceca07997ff0a2e88e9e09d5..06506e94aa479a8786facf67d8f19f4cce53af5f 100644 |
| --- a/chrome/browser/extensions/sandboxed_unpacker.cc |
| +++ b/chrome/browser/extensions/sandboxed_unpacker.cc |
| @@ -24,7 +24,7 @@ |
| #include "chrome/common/chrome_switches.h" |
| #include "chrome/common/chrome_utility_messages.h" |
| #include "chrome/common/extensions/extension.h" |
| -#include "chrome/common/extensions/extension_constants.h" |
| +// #include "chrome/common/extensions/extension_constants.h" |
|
Matt Perry
2013/07/19 22:29:11
remove
Yoyo Zhou
2013/07/19 22:50:03
Oops, done.
|
| #include "chrome/common/extensions/extension_file_util.h" |
| #include "chrome/common/extensions/extension_l10n_util.h" |
| #include "chrome/common/extensions/extension_manifest_constants.h" |
| @@ -182,7 +182,7 @@ bool FindWritableTempLocation(const base::FilePath& extensions_dir, |
| bool ReadImagesFromFile(const base::FilePath& extension_path, |
| DecodedImages* images) { |
| base::FilePath path = |
| - extension_path.AppendASCII(extension_filenames::kDecodedImagesFilename); |
| + extension_path.AppendASCII(kDecodedImagesFilename); |
| std::string file_str; |
| if (!file_util::ReadFileToString(path, &file_str)) |
| return false; |
| @@ -198,7 +198,7 @@ bool ReadImagesFromFile(const base::FilePath& extension_path, |
| bool ReadMessageCatalogsFromFile(const base::FilePath& extension_path, |
| base::DictionaryValue* catalogs) { |
| base::FilePath path = extension_path.AppendASCII( |
| - extension_filenames::kDecodedMessageCatalogsFilename); |
| + kDecodedMessageCatalogsFilename); |
| std::string file_str; |
| if (!file_util::ReadFileToString(path, &file_str)) |
| return false; |
| @@ -264,8 +264,7 @@ void SandboxedUnpacker::Start() { |
| return; // ReportFailure() already called. |
| // Initialize the path that will eventually contain the unpacked extension. |
| - extension_root_ = temp_dir_.path().AppendASCII( |
| - extension_filenames::kTempExtensionName); |
| + extension_root_ = temp_dir_.path().AppendASCII(kTempExtensionName); |
| PATH_LENGTH_HISTOGRAM("Extensions.SandboxUnpackUnpackedCrxPathLength", |
| extension_root_); |