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

Unified Diff: components/webcrypto/webcrypto_util.h

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
« no previous file with comments | « components/webcrypto/webcrypto_impl.cc ('k') | components/webcrypto/webcrypto_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/webcrypto/webcrypto_util.h
diff --git a/content/child/webcrypto/webcrypto_util.h b/components/webcrypto/webcrypto_util.h
similarity index 88%
rename from content/child/webcrypto/webcrypto_util.h
rename to components/webcrypto/webcrypto_util.h
index 2da3d6083518f55aeabdfb5ccb62e54e10b2e3f4..ab711ab7a2c53d9ddfa2ac725c568922d8fa59ed 100644
--- a/content/child/webcrypto/webcrypto_util.h
+++ b/components/webcrypto/webcrypto_util.h
@@ -2,46 +2,42 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_UTIL_H_
-#define CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_UTIL_H_
+#ifndef COMPONENTS_WEBCRYPTO_WEBCRYPTO_UTIL_H_
+#define COMPONENTS_WEBCRYPTO_WEBCRYPTO_UTIL_H_
#include <stdint.h>
#include <string>
#include "base/values.h"
-#include "content/common/content_export.h"
#include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
#include "third_party/WebKit/public/platform/WebCryptoKey.h"
-namespace content {
-
namespace webcrypto {
class Status;
// Creates a WebCryptoAlgorithm without any parameters.
-CONTENT_EXPORT blink::WebCryptoAlgorithm CreateAlgorithm(
- blink::WebCryptoAlgorithmId id);
+blink::WebCryptoAlgorithm CreateAlgorithm(blink::WebCryptoAlgorithmId id);
// Creates an HMAC import algorithm whose inner hash algorithm is determined by
// the specified algorithm ID. It is an error to call this method with a hash
// algorithm that is not SHA*.
-CONTENT_EXPORT blink::WebCryptoAlgorithm CreateHmacImportAlgorithm(
+blink::WebCryptoAlgorithm CreateHmacImportAlgorithm(
blink::WebCryptoAlgorithmId hash_id,
unsigned int length_bits);
// Same as above but without specifying a length.
-CONTENT_EXPORT blink::WebCryptoAlgorithm CreateHmacImportAlgorithmNoLength(
+blink::WebCryptoAlgorithm CreateHmacImportAlgorithmNoLength(
blink::WebCryptoAlgorithmId hash_id);
// Creates an import algorithm for RSA algorithms that take a hash.
// It is an error to call this with a hash_id that is not a SHA*.
-CONTENT_EXPORT blink::WebCryptoAlgorithm CreateRsaHashedImportAlgorithm(
+blink::WebCryptoAlgorithm CreateRsaHashedImportAlgorithm(
blink::WebCryptoAlgorithmId id,
blink::WebCryptoAlgorithmId hash_id);
// Creates an import algorithm for EC keys.
-CONTENT_EXPORT blink::WebCryptoAlgorithm CreateEcImportAlgorithm(
+blink::WebCryptoAlgorithm CreateEcImportAlgorithm(
blink::WebCryptoAlgorithmId id,
blink::WebCryptoNamedCurve named_curve);
@@ -134,6 +130,4 @@ Status GetUsagesForGenerateAsymmetricKey(
} // namespace webcrypto
-} // namespace content
-
-#endif // CONTENT_CHILD_WEBCRYPTO_WEBCRYPTO_UTIL_H_
+#endif // COMPONENTS_WEBCRYPTO_WEBCRYPTO_UTIL_H_
« no previous file with comments | « components/webcrypto/webcrypto_impl.cc ('k') | components/webcrypto/webcrypto_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698