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

Side by Side Diff: public/platform/WebCrypto.h

Issue 345593004: [webcrypto] Remove ifdef that is no longer needed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 26 matching lines...) Expand all
37 #include "WebPrivatePtr.h" 37 #include "WebPrivatePtr.h"
38 #include "WebString.h" 38 #include "WebString.h"
39 #include "WebVector.h" 39 #include "WebVector.h"
40 40
41 namespace WebCore { class CryptoResult; } 41 namespace WebCore { class CryptoResult; }
42 42
43 #if INSIDE_BLINK 43 #if INSIDE_BLINK
44 namespace WTF { template <typename T> class PassRefPtr; } 44 namespace WTF { template <typename T> class PassRefPtr; }
45 #endif 45 #endif
46 46
47 // FIXME: Remove once chromium side rolls.
48 #define WEBCRYPTO_RESULT_ACCEPTS_JSON 1
49
50 namespace blink { 47 namespace blink {
51 48
52 class WebArrayBuffer; 49 class WebArrayBuffer;
53 class WebString; 50 class WebString;
54 51
55 enum WebCryptoErrorType { 52 enum WebCryptoErrorType {
56 WebCryptoErrorTypeType, 53 WebCryptoErrorTypeType,
57 WebCryptoErrorTypeNotSupported, 54 WebCryptoErrorTypeNotSupported,
58 WebCryptoErrorTypeSyntax, 55 WebCryptoErrorTypeSyntax,
59 WebCryptoErrorTypeInvalidState, 56 WebCryptoErrorTypeInvalidState,
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 // Returns true on success. 267 // Returns true on success.
271 virtual bool serializeKeyForClone(const WebCryptoKey&, WebVector<unsigned ch ar>&) { return false; } 268 virtual bool serializeKeyForClone(const WebCryptoKey&, WebVector<unsigned ch ar>&) { return false; }
272 269
273 protected: 270 protected:
274 virtual ~WebCrypto() { } 271 virtual ~WebCrypto() { }
275 }; 272 };
276 273
277 } // namespace blink 274 } // namespace blink
278 275
279 #endif 276 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698