Index: chrome/common/extensions/unpacker.cc |
diff --git a/chrome/common/extensions/unpacker.cc b/chrome/common/extensions/unpacker.cc |
index 234ec30abb8045d6471a95038f319ea796cec9a3..c5e11828b1b6d960c722b827e8c720c888381923 100644 |
--- a/chrome/common/extensions/unpacker.cc |
+++ b/chrome/common/extensions/unpacker.cc |
@@ -24,6 +24,7 @@ |
#include "chrome/common/url_constants.h" |
#include "chrome/common/zip.h" |
#include "content/public/common/common_param_traits.h" |
+#include "extensions/common/constants.h" |
#include "grit/generated_resources.h" |
#include "ipc/ipc_message_utils.h" |
#include "net/base/file_stream.h" |
@@ -99,7 +100,7 @@ Unpacker::~Unpacker() { |
DictionaryValue* Unpacker::ReadManifest() { |
base::FilePath manifest_path = |
- temp_install_dir_.Append(Extension::kManifestFilename); |
+ temp_install_dir_.Append(kManifestFilename); |
if (!file_util::PathExists(manifest_path)) { |
SetError(errors::kInvalidManifest); |
return NULL; |
@@ -123,7 +124,7 @@ DictionaryValue* Unpacker::ReadManifest() { |
bool Unpacker::ReadAllMessageCatalogs(const std::string& default_locale) { |
base::FilePath locales_path = |
- temp_install_dir_.Append(Extension::kLocaleFolder); |
+ temp_install_dir_.Append(kLocaleFolder); |
// Not all folders under _locales have to be valid locales. |
file_util::FileEnumerator locales(locales_path, |
@@ -138,8 +139,7 @@ bool Unpacker::ReadAllMessageCatalogs(const std::string& default_locale) { |
all_locales)) |
continue; |
- base::FilePath messages_path = |
- locale_path.Append(Extension::kMessagesFilename); |
+ base::FilePath messages_path = locale_path.Append(kMessagesFilename); |
if (!ReadMessageCatalog(messages_path)) |
return false; |