Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Unified Diff: components/webcrypto/openssl/pbkdf2_openssl.cc

Issue 1077273002: html_viewer: Move webcrypto to a place where html_viewer can use it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to ToT Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/webcrypto/openssl/pbkdf2_openssl.cc
diff --git a/content/child/webcrypto/openssl/pbkdf2_openssl.cc b/components/webcrypto/openssl/pbkdf2_openssl.cc
similarity index 91%
rename from content/child/webcrypto/openssl/pbkdf2_openssl.cc
rename to components/webcrypto/openssl/pbkdf2_openssl.cc
index 5c7bf1a4c98b19a0a26644c3ae9cbdae3e1abeeb..c4ce8466ba635c188a8119c731cd950ead019d58 100644
--- a/content/child/webcrypto/openssl/pbkdf2_openssl.cc
+++ b/components/webcrypto/openssl/pbkdf2_openssl.cc
@@ -3,18 +3,16 @@
// found in the LICENSE file.
#include "base/stl_util.h"
-#include "content/child/webcrypto/algorithm_implementation.h"
-#include "content/child/webcrypto/crypto_data.h"
-#include "content/child/webcrypto/openssl/key_openssl.h"
-#include "content/child/webcrypto/openssl/util_openssl.h"
-#include "content/child/webcrypto/status.h"
-#include "content/child/webcrypto/webcrypto_util.h"
+#include "components/webcrypto/algorithm_implementation.h"
+#include "components/webcrypto/crypto_data.h"
+#include "components/webcrypto/openssl/key_openssl.h"
+#include "components/webcrypto/openssl/util_openssl.h"
+#include "components/webcrypto/status.h"
+#include "components/webcrypto/webcrypto_util.h"
#include "crypto/openssl_util.h"
#include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
#include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
-namespace content {
-
namespace webcrypto {
namespace {
@@ -118,5 +116,3 @@ AlgorithmImplementation* CreatePlatformPbkdf2Implementation() {
}
} // namespace webcrypto
-
-} // namespace content
« no previous file with comments | « components/webcrypto/openssl/key_openssl.cc ('k') | components/webcrypto/openssl/rsa_hashed_algorithm_openssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698