Index: chrome/utility/extensions/unpacker.cc |
diff --git a/chrome/utility/extensions/unpacker.cc b/chrome/utility/extensions/unpacker.cc |
index 09cb224aa0e2797e3fb15a5fa29a29646ee02aaf..f2c67276a56acf332b9bf677e95989248a22e380 100644 |
--- a/chrome/utility/extensions/unpacker.cc |
+++ b/chrome/utility/extensions/unpacker.cc |
@@ -21,11 +21,11 @@ |
#include "chrome/common/extensions/extension.h" |
#include "chrome/common/extensions/extension_file_util.h" |
#include "chrome/common/extensions/extension_l10n_util.h" |
-#include "chrome/common/extensions/extension_manifest_constants.h" |
#include "content/public/child/image_decoder_utils.h" |
#include "content/public/common/common_param_traits.h" |
#include "extensions/common/constants.h" |
#include "extensions/common/manifest.h" |
+#include "extensions/common/manifest_constants.h" |
#include "grit/generated_resources.h" |
#include "ipc/ipc_message_utils.h" |
#include "net/base/file_stream.h" |
@@ -34,11 +34,13 @@ |
#include "ui/base/l10n/l10n_util.h" |
#include "ui/gfx/size.h" |
-namespace errors = extension_manifest_errors; |
-namespace keys = extensions::manifest_keys; |
+namespace extensions { |
namespace { |
+namespace errors = manifest_errors; |
+namespace keys = manifest_keys; |
+ |
// A limit to stop us passing dangerously large canvases to the browser. |
const int kMaxImageCanvas = 4096 * 4096; |
@@ -85,8 +87,6 @@ bool PathContainsParentDirectory(const base::FilePath& path) { |
} // namespace |
-namespace extensions { |
- |
struct Unpacker::InternalData { |
DecodedImages decoded_images; |
}; |