components/os_crypt/os_crypt_win.cc - Issue 686883002: Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: sleevi comments 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..bbed44136579fb8f3fc037bcae87374dc1b20391 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_shim.h"

#pragma comment(lib, "crypt32.lib")

« no previous file with comments | « components/os_crypt/ie7_password_win.cc ('k') | crypto/capi_util.h » ('j') | no next file with comments »