diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 21:25:20 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 21:25:20 +0000 |
commit | 2bfe16c46a649b378208484be901769a8e36625e (patch) | |
tree | 070ac98cea8c46332abe3a07b6acbf79426ad461 /chrome/browser/extensions/extension_creator.cc | |
parent | 41208b9eb3885b1bd3a4e69542f541f1f7df8a23 (diff) | |
download | chromium_src-2bfe16c46a649b378208484be901769a8e36625e.zip chromium_src-2bfe16c46a649b378208484be901769a8e36625e.tar.gz chromium_src-2bfe16c46a649b378208484be901769a8e36625e.tar.bz2 |
Revert "Move components/zip to third_party/zip", which broke linux and android tests.
This reverts r197964.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_creator.cc')
-rw-r--r-- | chrome/browser/extensions/extension_creator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index 6efc50c..b7724c0 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc @@ -16,12 +16,12 @@ #include "chrome/browser/extensions/extension_creator_filter.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" +#include "components/zip/zip.h" #include "crypto/rsa_private_key.h" #include "crypto/signature_creator.h" #include "extensions/common/crx_file.h" #include "extensions/common/id_util.h" #include "grit/generated_resources.h" -#include "third_party/zlib/google/zip.h" #include "ui/base/l10n/l10n_util.h" namespace { |