From 18d3ed36f113ef9fb159d729ec5c89b578ece692 Mon Sep 17 00:00:00 2001 From: pmonette Date: Fri, 16 Oct 2015 14:06:06 -0700 Subject: Adding error handlers to setup.exe. The handlers make setup crash cleanly when we run out of memory, on heap corruption and on invalid parameters in the CRT. Moved 2 functions from startup_helper_win to base target. Renamed startup_helper_win to sandbox_helper_win now that it contains only a function related to the sandbox. BUG=530624 Review URL: https://codereview.chromium.org/1387963006 Cr-Commit-Position: refs/heads/master@{#354591} --- extensions/shell/app/shell_main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/shell') diff --git a/extensions/shell/app/shell_main.cc b/extensions/shell/app/shell_main.cc index 18a6e63..f3aac10 100644 --- a/extensions/shell/app/shell_main.cc +++ b/extensions/shell/app/shell_main.cc @@ -6,7 +6,7 @@ #include "extensions/shell/app/shell_main_delegate.h" #if defined(OS_WIN) -#include "content/public/app/startup_helper_win.h" +#include "content/public/app/sandbox_helper_win.h" #include "sandbox/win/src/sandbox_types.h" #endif -- cgit v1.1