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

Unified Diff: src/utils/win/SkAutoCoInitialize.cpp

Issue 2041943002: SkLeanWindows.h: #include "Windows.h" fewer places (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2016-06-07 (Tuesday) 11:28:42 EDT Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/utils/SkThreadUtils_win.h ('k') | src/utils/win/SkIStream.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/win/SkAutoCoInitialize.cpp
diff --git a/src/utils/win/SkAutoCoInitialize.cpp b/src/utils/win/SkAutoCoInitialize.cpp
index 3b7b42b74f2a847ba18ab1eab4baa15d92741b72..f6da67dcaea381821c6cda5ef348f2759433f0bd 100644
--- a/src/utils/win/SkAutoCoInitialize.cpp
+++ b/src/utils/win/SkAutoCoInitialize.cpp
@@ -8,12 +8,11 @@
#include "SkTypes.h"
#if defined(SK_BUILD_FOR_WIN32)
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ole2.h>
#include "SkAutoCoInitialize.h"
+#include <objbase.h>
+#include <winerror.h>
+
SkAutoCoInitialize::SkAutoCoInitialize() :
fHR(
CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE)
« no previous file with comments | « src/utils/SkThreadUtils_win.h ('k') | src/utils/win/SkIStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698