net/base/keygen_handler_win.cc - Issue 683113005: Update from chromium https://crrev.com/302282 - Code Review

Chromium Code Reviews

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

(1192)

My Issues | Starred Open | Closed | All

Unified Diff: net/base/keygen_handler_win.cc

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: 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

« no previous file with comments | « net/base/filename_util_unittest.cc ('k') | net/base/load_flags_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/base/keygen_handler_win.cc

diff --git a/net/base/keygen_handler_win.cc b/net/base/keygen_handler_win.cc

index f97ada76423ea10191f4236110377f2db4f29d14..ffa3b2e414e66585aca6c53acd25f8ad3177a73f 100644

--- a/net/base/keygen_handler_win.cc

+++ b/net/base/keygen_handler_win.cc

@@ -5,10 +5,7 @@

#include "net/base/keygen_handler.h"

#include <windows.h>

-#include <wincrypt.h>

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

#include <rpc.h>

-#pragma comment(lib, "rpcrt4.lib")

#include <list>

#include <string>

@@ -22,7 +19,10 @@

#include "base/strings/utf_string_conversions.h"

#include "crypto/capi_util.h"

#include "crypto/scoped_capi_types.h"

+#include "crypto/wincrypt_shim.h"

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

+#pragma comment(lib, "rpcrt4.lib")

namespace net {

« no previous file with comments | « net/base/filename_util_unittest.cc ('k') | net/base/load_flags_list.h » ('j') | no next file with comments »

Powered by Google App Engine

This is Rietveld 408576698