Chromium Code Reviews| Index: chrome/installer/setup/installer_crash_reporting.cc |
| diff --git a/chrome/installer/setup/installer_crash_reporting.cc b/chrome/installer/setup/installer_crash_reporting.cc |
| index c41035c061524d98028b5dcee76f6f96d6cfdbba..75979a74fe2ecb76ae840b66e712d34bd79ccc73 100644 |
| --- a/chrome/installer/setup/installer_crash_reporting.cc |
| +++ b/chrome/installer/setup/installer_crash_reporting.cc |
| @@ -4,6 +4,7 @@ |
| #include "chrome/installer/setup/installer_crash_reporting.h" |
| +#include "base/command_line.h" |
| #include "base/debug/crash_logging.h" |
| #include "base/debug/leak_annotations.h" |
| #include "base/logging.h" |
| @@ -127,7 +128,10 @@ size_t RegisterCrashKeys() { |
| // kLargeSize, which is wasteful.) |
| { kStateKey, crash_keys::kMediumSize }, |
| }; |
| - return base::debug::InitCrashKeys(&kFixedKeys[0], arraysize(kFixedKeys), |
| + std::vector<base::debug::CrashKey> keys(std::begin(kFixedKeys), |
|
grt (UTC plus 2)
2015/11/28 02:04:30
#include <iterator> for std::begin and std::end
#i
Joe Mason
2015/11/30 17:23:55
Done.
|
| + std::end(kFixedKeys)); |
| + crash_keys::GetCrashKeysForCommandLineSwitches(&keys); |
| + return base::debug::InitCrashKeys(keys.data(), keys.size(), |
| crash_keys::kChunkMaxLength); |
| } |
| @@ -146,4 +150,8 @@ void SetInitialCrashKeys(const InstallerState& state) { |
| SetCrashKeyValue(kStateKey, base::UTF16ToUTF8(state_key)); |
| } |
| +void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) { |
| + crash_keys::SetSwitchesFromCommandLine(command_line, nullptr); |
| +} |
| + |
| } // namespace installer |