Chromium Code Reviews| Index: snapshot/win/module_snapshot_win.cc |
| diff --git a/snapshot/win/module_snapshot_win.cc b/snapshot/win/module_snapshot_win.cc |
| index f4f8725915032da51d7e23fc9b61dc0e68c246f4..97f1c85eeabb9a0be1f9d6a1d9b339188ade692c 100644 |
| --- a/snapshot/win/module_snapshot_win.cc |
| +++ b/snapshot/win/module_snapshot_win.cc |
| @@ -15,6 +15,7 @@ |
| #include "snapshot/win/module_snapshot_win.h" |
| #include "base/strings/utf_string_conversions.h" |
| +#include "snapshot/win/pe_image_annotations_reader.h" |
| #include "snapshot/win/pe_image_reader.h" |
| #include "util/misc/tri_state.h" |
| #include "util/misc/uuid.h" |
| @@ -153,15 +154,17 @@ void ModuleSnapshotWin::UUID(crashpad::UUID* uuid) const { |
| std::vector<std::string> ModuleSnapshotWin::AnnotationsVector() const { |
| INITIALIZATION_STATE_DCHECK_VALID(initialized_); |
| - CHECK(false) << "TODO(scottmg)"; |
| + // These correspond to system-logged things on Mac. We don't currently track |
| + // any of these on Windows, but could in the future. |
|
Robert Sesek
2015/05/14 18:55:27
Is this worth filing a bug for?
scottmg
2015/05/14 19:10:02
Good idea, https://code.google.com/p/crashpad/issu
|
| return std::vector<std::string>(); |
| } |
| std::map<std::string, std::string> ModuleSnapshotWin::AnnotationsSimpleMap() |
| const { |
| INITIALIZATION_STATE_DCHECK_VALID(initialized_); |
| - CHECK(false) << "TODO(scottmg)"; |
| - return std::map<std::string, std::string>(); |
| + PEImageAnnotationsReader annotations_reader( |
| + process_reader_, pe_image_reader_.get(), name_); |
| + return annotations_reader.SimpleMap(); |
| } |
| } // namespace internal |