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

Unified Diff: components/os_crypt/os_crypt_win.cc

Issue 686883002: Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: X509_NAME -> WINCRYPT_X509_NAME, rebase Created 6 years, 2 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/os_crypt/os_crypt_win.cc
diff --git a/components/os_crypt/os_crypt_win.cc b/components/os_crypt/os_crypt_win.cc
index 1f4e7494ca2b406f8ea73191f6e840dff787da88..3bca48e4d6c4be45803ab194134c5cee865d314f 100644
--- a/components/os_crypt/os_crypt_win.cc
+++ b/components/os_crypt/os_crypt_win.cc
@@ -5,9 +5,9 @@
#include "components/os_crypt/os_crypt.h"
#include <windows.h>
-#include <wincrypt.h>
#include "base/strings/utf_string_conversions.h"
+#include "crypto/wincrypt.h"
#pragma comment(lib, "crypt32.lib")

Powered by Google App Engine
This is Rietveld 408576698