| Index: chrome/utility/extensions/unpacker.cc
|
| diff --git a/chrome/utility/extensions/unpacker.cc b/chrome/utility/extensions/unpacker.cc
|
| index 4ae8853143da96f0c78b85134e608237fe1e81ae..fddd1585f875fb2a830d86a1f48d35f8d7eaa89a 100644
|
| --- a/chrome/utility/extensions/unpacker.cc
|
| +++ b/chrome/utility/extensions/unpacker.cc
|
| @@ -37,7 +37,6 @@
|
|
|
| namespace errors = extension_manifest_errors;
|
| namespace keys = extension_manifest_keys;
|
| -namespace filenames = extension_filenames;
|
|
|
| namespace {
|
|
|
| @@ -109,7 +108,7 @@ Unpacker::~Unpacker() {
|
|
|
| base::DictionaryValue* Unpacker::ReadManifest() {
|
| base::FilePath manifest_path =
|
| - temp_install_dir_.Append(kManifestFilename);
|
| + temp_install_dir_.Append(filenames::kManifestFilename);
|
| if (!base::PathExists(manifest_path)) {
|
| SetError(errors::kInvalidManifest);
|
| return NULL;
|
| @@ -133,7 +132,7 @@ base::DictionaryValue* Unpacker::ReadManifest() {
|
|
|
| bool Unpacker::ReadAllMessageCatalogs(const std::string& default_locale) {
|
| base::FilePath locales_path =
|
| - temp_install_dir_.Append(kLocaleFolder);
|
| + temp_install_dir_.Append(filenames::kLocaleFolder);
|
|
|
| // Not all folders under _locales have to be valid locales.
|
| base::FileEnumerator locales(locales_path,
|
| @@ -148,7 +147,8 @@ bool Unpacker::ReadAllMessageCatalogs(const std::string& default_locale) {
|
| all_locales))
|
| continue;
|
|
|
| - base::FilePath messages_path = locale_path.Append(kMessagesFilename);
|
| + base::FilePath messages_path =
|
| + locale_path.Append(filenames::kMessagesFilename);
|
|
|
| if (!ReadMessageCatalog(messages_path))
|
| return false;
|
|
|