diff options
| author | pmonette <pmonette@chromium.org> | 2015-10-16 14:06:06 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-16 21:07:14 +0000 |
| commit | 18d3ed36f113ef9fb159d729ec5c89b578ece692 (patch) | |
| tree | 0a997db022ca60de0f61f30514f32ee0dbb23fc2 /ash | |
| parent | f12641d2936ba900434c4e9dd7945f2b26885269 (diff) | |
| download | chromium_src-18d3ed36f113ef9fb159d729ec5c89b578ece692.zip chromium_src-18d3ed36f113ef9fb159d729ec5c89b578ece692.tar.gz chromium_src-18d3ed36f113ef9fb159d729ec5c89b578ece692.tar.bz2 | |
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}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash.gyp | 2 | ||||
| -rw-r--r-- | ash/shell/content/shell_with_content_main.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 83fbb9b..e994b16 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -1300,7 +1300,7 @@ 'conditions': [ ['OS=="win"', { 'dependencies': [ - '../content/content.gyp:content_startup_helper_win', + '../content/content.gyp:sandbox_helper_win', ], }], ], diff --git a/ash/shell/content/shell_with_content_main.cc b/ash/shell/content/shell_with_content_main.cc index fad3bdf..59bba97 100644 --- a/ash/shell/content/shell_with_content_main.cc +++ b/ash/shell/content/shell_with_content_main.cc @@ -10,7 +10,7 @@ #include "content/public/app/content_main.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 |