diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 08:53:41 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-16 08:53:41 +0000 |
| commit | 0c3c97314b8e47ce78241aacb1c83ad70284093e (patch) | |
| tree | f274b48aa6edc2d2d0bb0273994807c5f8bd835a /chrome/utility | |
| parent | bcde15805a8b8b82a485dfa1632571a2d651ae2e (diff) | |
| download | chromium_src-0c3c97314b8e47ce78241aacb1c83ad70284093e.zip chromium_src-0c3c97314b8e47ce78241aacb1c83ad70284093e.tar.gz chromium_src-0c3c97314b8e47ce78241aacb1c83ad70284093e.tar.bz2 | |
Move the rest of extension_manifest_constants to top-level extensions/
Move the rest of chrome/common/extensions/extension_manifest_constants to
extensions/common/manifest_constants.
s/extension_manifest_[values|errors]/extensions::manifest_[values|errors]
Remove include of manifest constants in ~20 files that didn't use it.
Fixed small nits when I found (taking out unnecessary extensions::, etc).
TBR=davemoore@chromium.org (c/b/chromeos/)
TBR=pkotwicz@chromium.org (c/b/themes/)
TBR=thakis@chromium.org (c/b/ui/cocoa/, c/renderer/)
TBR=dimich@chromium.org (c/b/ui/panels/)
TBR=sky@chromium.org (c/b/ui/views/)
TBR=finnur@chromium.org (c/b/ui/webui/extensions/)
BUG=159265
Review URL: https://chromiumcodereview.appspot.com/23744004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223318 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/utility')
| -rw-r--r-- | chrome/utility/extensions/unpacker.cc | 10 | ||||
| -rw-r--r-- | chrome/utility/extensions/unpacker_unittest.cc | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/chrome/utility/extensions/unpacker.cc b/chrome/utility/extensions/unpacker.cc index 09cb224a..f2c6727 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; }; diff --git a/chrome/utility/extensions/unpacker_unittest.cc b/chrome/utility/extensions/unpacker_unittest.cc index b61a42c..eb74a17 100644 --- a/chrome/utility/extensions/unpacker_unittest.cc +++ b/chrome/utility/extensions/unpacker_unittest.cc @@ -10,19 +10,19 @@ #include "base/values.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/utility/extensions/unpacker.h" #include "extensions/common/constants.h" +#include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" -namespace errors = extension_manifest_errors; -namespace keys = extensions::manifest_keys; - namespace extensions { +namespace errors = manifest_errors; +namespace keys = manifest_keys; + class UnpackerTest : public testing::Test { -public: + public: virtual ~UnpackerTest() { LOG(WARNING) << "Deleting temp dir: " << temp_dir_.path().LossyDisplayName(); |