| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/common/crash_keys.h" | 5 #include "chrome/common/crash_keys.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/format_macros.h" | 8 #include "base/format_macros.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/string_split.h" | 10 #include "base/strings/string_split.h" |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 const char kZombieTrace[] = "zombie_dealloc_bt"; | 121 const char kZombieTrace[] = "zombie_dealloc_bt"; |
| 122 | 122 |
| 123 } // namespace mac | 123 } // namespace mac |
| 124 #endif | 124 #endif |
| 125 | 125 |
| 126 #if defined(KASKO) | 126 #if defined(KASKO) |
| 127 const char kKaskoGuid[] = "kasko-guid"; | 127 const char kKaskoGuid[] = "kasko-guid"; |
| 128 const char kKaskoEquivalentGuid[] = "kasko-equivalent-guid"; | 128 const char kKaskoEquivalentGuid[] = "kasko-equivalent-guid"; |
| 129 #endif | 129 #endif |
| 130 | 130 |
| 131 const char kBug464926CrashKey[] = "bug-464926-info"; |
| 132 |
| 131 size_t RegisterChromeCrashKeys() { | 133 size_t RegisterChromeCrashKeys() { |
| 132 // The following keys may be chunked by the underlying crash logging system, | 134 // The following keys may be chunked by the underlying crash logging system, |
| 133 // but ultimately constitute a single key-value pair. | 135 // but ultimately constitute a single key-value pair. |
| 134 base::debug::CrashKey fixed_keys[] = { | 136 base::debug::CrashKey fixed_keys[] = { |
| 135 #if defined(OS_MACOSX) | 137 #if defined(OS_MACOSX) |
| 136 { kMetricsClientId, kSmallSize }, | 138 { kMetricsClientId, kSmallSize }, |
| 137 #else | 139 #else |
| 138 { kClientId, kSmallSize }, | 140 { kClientId, kSmallSize }, |
| 139 #endif | 141 #endif |
| 140 { kChannel, kSmallSize }, | 142 { kChannel, kSmallSize }, |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 { "channel_error_bt", kMediumSize }, | 184 { "channel_error_bt", kMediumSize }, |
| 183 { "remove_route_bt", kMediumSize }, | 185 { "remove_route_bt", kMediumSize }, |
| 184 { "rwhvm_window", kMediumSize }, | 186 { "rwhvm_window", kMediumSize }, |
| 185 // media/: | 187 // media/: |
| 186 { "VideoCaptureDeviceQTKit", kSmallSize }, | 188 { "VideoCaptureDeviceQTKit", kSmallSize }, |
| 187 #endif | 189 #endif |
| 188 #if defined(KASKO) | 190 #if defined(KASKO) |
| 189 { kKaskoGuid, kSmallSize }, | 191 { kKaskoGuid, kSmallSize }, |
| 190 { kKaskoEquivalentGuid, kSmallSize }, | 192 { kKaskoEquivalentGuid, kSmallSize }, |
| 191 #endif | 193 #endif |
| 194 { kBug464926CrashKey, kSmallSize }, |
| 192 }; | 195 }; |
| 193 | 196 |
| 194 // This dynamic set of keys is used for sets of key value pairs when gathering | 197 // This dynamic set of keys is used for sets of key value pairs when gathering |
| 195 // a collection of data, like command line switches or extension IDs. | 198 // a collection of data, like command line switches or extension IDs. |
| 196 std::vector<base::debug::CrashKey> keys( | 199 std::vector<base::debug::CrashKey> keys( |
| 197 fixed_keys, fixed_keys + arraysize(fixed_keys)); | 200 fixed_keys, fixed_keys + arraysize(fixed_keys)); |
| 198 | 201 |
| 199 // Register the switches. | 202 // Register the switches. |
| 200 { | 203 { |
| 201 // The fixed_keys names are string constants. Use static storage for | 204 // The fixed_keys names are string constants. Use static storage for |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 } | 438 } |
| 436 | 439 |
| 437 ScopedPrinterInfo::~ScopedPrinterInfo() { | 440 ScopedPrinterInfo::~ScopedPrinterInfo() { |
| 438 for (size_t i = 0; i < kPrinterInfoCount; ++i) { | 441 for (size_t i = 0; i < kPrinterInfoCount; ++i) { |
| 439 std::string key = base::StringPrintf(kPrinterInfo, i + 1); | 442 std::string key = base::StringPrintf(kPrinterInfo, i + 1); |
| 440 base::debug::ClearCrashKey(key); | 443 base::debug::ClearCrashKey(key); |
| 441 } | 444 } |
| 442 } | 445 } |
| 443 | 446 |
| 444 } // namespace crash_keys | 447 } // namespace crash_keys |
| OLD | NEW |