Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(548)

Side by Side Diff: chrome/common/crash_keys.cc

Issue 2377963002: restore LOG_FATAL crash key on windows
Patch Set: return protection against reentrancy Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/format_macros.h" 9 #include "base/format_macros.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 #if defined(OS_MACOSX) || defined(OS_WIN) 96 #if defined(OS_MACOSX) || defined(OS_WIN)
97 { kMetricsClientId, kSmallSize }, 97 { kMetricsClientId, kSmallSize },
98 #else 98 #else
99 { kClientId, kSmallSize }, 99 { kClientId, kSmallSize },
100 #endif 100 #endif
101 { kChannel, kSmallSize }, 101 { kChannel, kSmallSize },
102 { kActiveURL, kLargeSize }, 102 { kActiveURL, kLargeSize },
103 { kNumVariations, kSmallSize }, 103 { kNumVariations, kSmallSize },
104 { kVariations, kLargeSize }, 104 { kVariations, kLargeSize },
105 { kNumExtensionsCount, kSmallSize }, 105 { kNumExtensionsCount, kSmallSize },
106 { kShutdownType, kSmallSize }, 106 { kShutdownType, kSmallSize },
Robert Sesek 2016/10/21 15:38:00 Move the key to here, since it's not a temporary o
rkuksin 2016/10/24 09:08:28 Done.
107 #if !defined(OS_ANDROID) 107 #if !defined(OS_ANDROID)
108 { kGPUVendorID, kSmallSize }, 108 { kGPUVendorID, kSmallSize },
109 { kGPUDeviceID, kSmallSize }, 109 { kGPUDeviceID, kSmallSize },
110 #endif 110 #endif
111 { kGPUDriverVersion, kSmallSize }, 111 { kGPUDriverVersion, kSmallSize },
112 { kGPUPixelShaderVersion, kSmallSize }, 112 { kGPUPixelShaderVersion, kSmallSize },
113 { kGPUVertexShaderVersion, kSmallSize }, 113 { kGPUVertexShaderVersion, kSmallSize },
114 #if defined(OS_MACOSX) 114 #if defined(OS_MACOSX)
115 { kGPUGLVersion, kSmallSize }, 115 { kGPUGLVersion, kSmallSize },
116 #elif defined(OS_POSIX) 116 #elif defined(OS_POSIX)
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 { "swdh_register_cannot_scope_url", crash_keys::kLargeSize }, 220 { "swdh_register_cannot_scope_url", crash_keys::kLargeSize },
221 { "swdh_register_cannot_script_url", crash_keys::kLargeSize }, 221 { "swdh_register_cannot_script_url", crash_keys::kLargeSize },
222 222
223 // Temporary for https://crbug.com/619294. 223 // Temporary for https://crbug.com/619294.
224 { "swdh_unregister_cannot_host_url", crash_keys::kLargeSize }, 224 { "swdh_unregister_cannot_host_url", crash_keys::kLargeSize },
225 { "swdh_unregister_cannot_scope_url", crash_keys::kLargeSize }, 225 { "swdh_unregister_cannot_scope_url", crash_keys::kLargeSize },
226 226
227 // Temporary for https://crbug.com/630496. 227 // Temporary for https://crbug.com/630496.
228 { "swdh_get_registration_cannot_host_url", crash_keys::kLargeSize }, 228 { "swdh_get_registration_cannot_host_url", crash_keys::kLargeSize },
229 { "swdh_get_registration_cannot_document_url", crash_keys::kLargeSize }, 229 { "swdh_get_registration_cannot_document_url", crash_keys::kLargeSize },
230
231 { "LOG_FATAL", crash_keys::kLargeSize },
230 }; 232 };
231 233
232 // This dynamic set of keys is used for sets of key value pairs when gathering 234 // This dynamic set of keys is used for sets of key value pairs when gathering
233 // a collection of data, like command line switches or extension IDs. 235 // a collection of data, like command line switches or extension IDs.
234 std::vector<base::debug::CrashKey> keys( 236 std::vector<base::debug::CrashKey> keys(
235 fixed_keys, fixed_keys + arraysize(fixed_keys)); 237 fixed_keys, fixed_keys + arraysize(fixed_keys));
236 238
237 crash_keys::GetCrashKeysForCommandLineSwitches(&keys); 239 crash_keys::GetCrashKeysForCommandLineSwitches(&keys);
238 240
239 // Register the extension IDs. 241 // Register the extension IDs.
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 } 358 }
357 359
358 ScopedPrinterInfo::~ScopedPrinterInfo() { 360 ScopedPrinterInfo::~ScopedPrinterInfo() {
359 for (size_t i = 0; i < kPrinterInfoCount; ++i) { 361 for (size_t i = 0; i < kPrinterInfoCount; ++i) {
360 std::string key = base::StringPrintf(kPrinterInfo, i + 1); 362 std::string key = base::StringPrintf(kPrinterInfo, i + 1);
361 base::debug::ClearCrashKey(key); 363 base::debug::ClearCrashKey(key);
362 } 364 }
363 } 365 }
364 366
365 } // namespace crash_keys 367 } // namespace crash_keys
OLDNEW
« no previous file with comments | « chrome/app/chrome_crash_reporter_client_win.cc ('k') | components/crash/content/app/crashpad.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698