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

Unified Diff: chrome/app/chrome_crash_reporter_client.h

Issue 1023783005: Merge Crashpad to the 42.0.2311 branch (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@2311
Patch Set: Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all.gyp ('k') | chrome/app/chrome_crash_reporter_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_crash_reporter_client.h
diff --git a/chrome/app/chrome_crash_reporter_client.h b/chrome/app/chrome_crash_reporter_client.h
index 9e45ed01abbda419384206fe512913d13c8a7072..80b069fdee887d2fde70c4d7c53d9a7fd3c66f3b 100644
--- a/chrome/app/chrome_crash_reporter_client.h
+++ b/chrome/app/chrome_crash_reporter_client.h
@@ -17,8 +17,10 @@ class ChromeCrashReporterClient : public crash_reporter::CrashReporterClient {
~ChromeCrashReporterClient() override;
// crash_reporter::CrashReporterClient implementation.
+#if !defined(OS_MACOSX)
void SetCrashReporterClientIdFromGUID(
const std::string& client_guid) override;
+#endif
#if defined(OS_WIN)
virtual bool GetAlternativeCrashDumpLocation(base::FilePath* crash_dir)
override;
@@ -61,10 +63,6 @@ class ChromeCrashReporterClient : public crash_reporter::CrashReporterClient {
int GetAndroidMinidumpDescriptor() override;
#endif
-#if defined(OS_MACOSX)
- void InstallAdditionalFilters(BreakpadRef breakpad) override;
-#endif
-
bool EnableBreakpadForProcess(const std::string& process_type) override;
private:
« no previous file with comments | « build/all.gyp ('k') | chrome/app/chrome_crash_reporter_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698