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

Unified Diff: base/allocator/allocator_check.cc

Issue 2907563002: allocator/Windows: delete the old non-unified allocator-shim (Closed)
Patch Set: remove comment Created 3 years, 7 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 | « base/allocator/README.md ('k') | base/allocator/allocator_shim_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/allocator/allocator_check.cc
diff --git a/base/allocator/allocator_check.cc b/base/allocator/allocator_check.cc
index 87d0e7ef61cf39097db766991efea031aff62db6..cae3d2a83e8bac336494570f11bb6e0d809f9e4d 100644
--- a/base/allocator/allocator_check.cc
+++ b/base/allocator/allocator_check.cc
@@ -4,10 +4,11 @@
#include "base/allocator/allocator_check.h"
+#include "base/allocator/features.h"
#include "build/build_config.h"
#if defined(OS_WIN)
-#include "base/allocator/allocator_shim_win.h"
+#include "base/allocator/winheap_stubs_win.h"
#endif
#if defined(OS_LINUX)
@@ -22,8 +23,9 @@ namespace base {
namespace allocator {
bool IsAllocatorInitialized() {
-#if defined(OS_WIN) && defined(ALLOCATOR_SHIM)
- // Set by allocator_shim_win.cc when the shimmed _set_new_mode() is called.
+#if defined(OS_WIN) && defined(USE_ALLOCATOR_SHIM)
+ // Set by allocator_shim_override_ucrt_symbols_win.h when the
+ // shimmed _set_new_mode() is called.
return g_is_win_shim_layer_initialized;
#elif defined(OS_LINUX) && defined(USE_TCMALLOC) && \
!defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
« no previous file with comments | « base/allocator/README.md ('k') | base/allocator/allocator_shim_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698