diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 19:01:58 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 19:01:58 +0000 |
| commit | d119207fd545b3b539390b19cd24f170a6fd769b (patch) | |
| tree | 5a3979b1109785b9fc350ce9079458a64a865c55 /components/breakpad | |
| parent | f75204bedc56872cc0b76626fd53c34dd2d42c75 (diff) | |
| download | chromium_src-d119207fd545b3b539390b19cd24f170a6fd769b.zip chromium_src-d119207fd545b3b539390b19cd24f170a6fd769b.tar.gz chromium_src-d119207fd545b3b539390b19cd24f170a6fd769b.tar.bz2 | |
Break dependency between breakpad and NaCl on Mac
Instead, go through the breakpad client interface
BUG=247431
R=bauerb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/20513003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215078 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/breakpad')
| -rw-r--r-- | components/breakpad/breakpad_client.cc | 5 | ||||
| -rw-r--r-- | components/breakpad/breakpad_client.h | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/components/breakpad/breakpad_client.cc b/components/breakpad/breakpad_client.cc index 9deb13e..a4c8c45 100644 --- a/components/breakpad/breakpad_client.cc +++ b/components/breakpad/breakpad_client.cc @@ -110,4 +110,9 @@ int BreakpadClient::GetAndroidMinidumpDescriptor() { } #endif +#if defined(OS_MACOSX) +void BreakpadClient::InstallAdditionalFilters(BreakpadRef breakpad) { +} +#endif + } // namespace breakpad diff --git a/components/breakpad/breakpad_client.h b/components/breakpad/breakpad_client.h index 486db02..35b4308 100644 --- a/components/breakpad/breakpad_client.h +++ b/components/breakpad/breakpad_client.h @@ -14,6 +14,17 @@ namespace base { class FilePath; } +#if defined(OS_MACOSX) +// We don't want to directly include +// breakpad/src/client/mac/Framework/Breakpad.h here, so we repeat the +// definition of BreakpadRef. +// +// On Mac, when compiling without breakpad support, a stub implementation is +// compiled in. Not having any includes of the breakpad library allows for +// reusing this header for the stub. +typedef void* BreakpadRef; +#endif + namespace breakpad { class BreakpadClient; @@ -108,6 +119,11 @@ class BreakpadClient { // Returns the descriptor key of the android minidump global descriptor. virtual int GetAndroidMinidumpDescriptor(); #endif + +#if defined(OS_MACOSX) + // Install additional breakpad filter callbacks. + virtual void InstallAdditionalFilters(BreakpadRef breakpad); +#endif }; } // namespace breakpad |