diff options
author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 20:47:40 +0000 |
---|---|---|
committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-15 20:47:40 +0000 |
commit | 36d772caff4517f3dc536f582816ac786508e2cb (patch) | |
tree | 97c04d0eb3e3d205ef980686ebb8300a2596e725 /chrome/app/breakpad_win.cc | |
parent | 7fea8ad60431ed71df2a087b131e4a5cde2b6755 (diff) | |
download | chromium_src-36d772caff4517f3dc536f582816ac786508e2cb.zip chromium_src-36d772caff4517f3dc536f582816ac786508e2cb.tar.gz chromium_src-36d772caff4517f3dc536f582816ac786508e2cb.tar.bz2 |
Revert r92730, r92731, r92732 ... will land again once I ensure the win builds compile.
TBR=jam@chromium.org
BUG=none
TEST=
Review URL: http://codereview.chromium.org/7400002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/breakpad_win.cc')
-rw-r--r-- | chrome/app/breakpad_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc index d47c99e..f2b29ad 100644 --- a/chrome/app/breakpad_win.cc +++ b/chrome/app/breakpad_win.cc @@ -25,12 +25,12 @@ #include "breakpad/src/client/windows/handler/exception_handler.h" #include "chrome/app/hard_error_handler_win.h" #include "chrome/common/child_process_logging.h" -#include "chrome/common/chrome_result_codes.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" #include "chrome/installer/util/google_chrome_sxs_distribution.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/install_util.h" +#include "content/common/result_codes.h" #include "policy/policy_constants.h" namespace { @@ -396,7 +396,7 @@ bool WrapMessageBoxWithSEH(const wchar_t* text, const wchar_t* caption, *exit_now = (IDOK != ::MessageBoxW(NULL, text, caption, flags)); } __except(EXCEPTION_EXECUTE_HANDLER) { // Its not safe to continue executing, exit silently here. - ::ExitProcess(chrome::RESULT_CODE_RESPAWN_FAILED); + ::ExitProcess(ResultCodes::RESPAWN_FAILED); } return true; @@ -445,7 +445,7 @@ extern "C" int __declspec(dllexport) CrashForException( EXCEPTION_POINTERS* info) { if (g_breakpad) { g_breakpad->WriteMinidumpForException(info); - ::ExitProcess(content::RESULT_CODE_KILLED); + ::ExitProcess(ResultCodes::KILLED); } return EXCEPTION_CONTINUE_SEARCH; } |