| Index: chrome/common/conflicts/module_watcher_win.h
|
| diff --git a/chrome/common/conflicts/module_watcher_win.h b/chrome/common/conflicts/module_watcher_win.h
|
| index b2255d024e18c266a704388fa57165f3d79bacf6..0d87bc806ffb2eb63284e9bc6b6d3fbf59dfb574 100644
|
| --- a/chrome/common/conflicts/module_watcher_win.h
|
| +++ b/chrome/common/conflicts/module_watcher_win.h
|
| @@ -8,7 +8,8 @@
|
| #include <memory>
|
|
|
| #include "base/callback.h"
|
| -#include "chrome/common/conflicts/module_event_win.mojom.h"
|
| +#include "base/files/file_path.h"
|
| +#include "chrome/common/conflicts/module_event_sink_win.mojom.h"
|
|
|
| class ModuleWatcherTest;
|
|
|
| @@ -22,14 +23,33 @@ union LDR_DLL_NOTIFICATION_DATA;
|
| // created.
|
| class ModuleWatcher {
|
| public:
|
| + // Houses information about a module load/unload event, and some module
|
| + // metadata.
|
| + struct ModuleEvent {
|
| + ModuleEvent() = default;
|
| + ModuleEvent(const ModuleEvent& other) = default;
|
| + ModuleEvent(mojom::ModuleEventType event_type,
|
| + const base::FilePath& module_path,
|
| + void* module_load_address,
|
| + size_t module_size);
|
| +
|
| + // The type of module event.
|
| + mojom::ModuleEventType event_type;
|
| + // The full path to the module on disk.
|
| + base::FilePath module_path;
|
| + // The load address of the module.
|
| + void* module_load_address;
|
| + // The size of the module in memory.
|
| + size_t module_size;
|
| + };
|
| +
|
| // The type of callback that will be invoked for each module event. This is
|
| // invoked by the loader and potentially on any thread. The loader lock is not
|
| // held but the execution of this callback blocks the module from being bound.
|
| // Keep the amount of work performed here to an absolute minimum. Note that
|
| // it is possible for this callback to be invoked after the destruction of the
|
| // watcher, but very unlikely.
|
| - using OnModuleEventCallback =
|
| - base::Callback<void(const mojom::ModuleEvent& event)>;
|
| + using OnModuleEventCallback = base::Callback<void(const ModuleEvent& event)>;
|
|
|
| // Creates and starts a watcher. This enumerates all loaded modules
|
| // synchronously on the current thread during construction, and provides
|
|
|