diff options
| -rw-r--r-- | chrome/browser/metrics/metrics_service.cc | 7 | ||||
| -rw-r--r-- | sandbox/win/src/sandbox_types.h | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 8dc8dcf..293af4d 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -215,6 +215,7 @@ #if defined(OS_WIN) #include <windows.h> // Needed for STATUS_* codes +#include "sandbox/win/src/sandbox_types.h" // For termination codes. #endif using base::Time; @@ -346,6 +347,12 @@ std::vector<int> GetAllCrashExitCodes() { for (size_t i = 0; i < arraysize(kExceptionCodes); ++i) codes.push_back(MapCrashExitCodeForHistogram(kExceptionCodes[i])); + + // Add the sandbox fatal termination codes. + for (int i = sandbox::SBOX_FATAL_INTEGRITY; + i <= sandbox::SBOX_FATAL_LAST; ++i) { + codes.push_back(MapCrashExitCodeForHistogram(i)); + } #endif return codes; diff --git a/sandbox/win/src/sandbox_types.h b/sandbox/win/src/sandbox_types.h index 8e9aef2..48f1b61 100644 --- a/sandbox/win/src/sandbox_types.h +++ b/sandbox/win/src/sandbox_types.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -57,7 +57,8 @@ enum TerminationCodes { SBOX_FATAL_FLUSHANDLES = 7008, // Failed to flush registry handles. SBOX_FATAL_CACHEDISABLE = 7009, // Failed to forbid HCKU caching. SBOX_FATAL_CLOSEHANDLES = 7010, // Failed to close pending handles. - SBOX_FATAL_MITIGATION = 7011 // Could not set the mitigation policy. + SBOX_FATAL_MITIGATION = 7011, // Could not set the mitigation policy. + SBOX_FATAL_LAST }; class BrokerServices; |