diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 15:37:47 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 15:37:47 +0000 |
| commit | e055be2497f5f5576b6dd78afecf78310682e541 (patch) | |
| tree | 22ad43bc5051edcac30579660caa48f78bb136ae /chrome/app | |
| parent | 620bbbbf6976cb1f87f1582cae1a1657d0c8200f (diff) | |
| download | chromium_src-e055be2497f5f5576b6dd78afecf78310682e541.zip chromium_src-e055be2497f5f5576b6dd78afecf78310682e541.tar.gz chromium_src-e055be2497f5f5576b6dd78afecf78310682e541.tar.bz2 | |
Move dependency on descriptors_android.h to breakpad client interface
BUG=247431
R=bauerb@chromium.org
Review URL: https://codereview.chromium.org/20607004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/breakpad_linux.cc | 3 | ||||
| -rw-r--r-- | chrome/app/chrome_breakpad_client.cc | 10 | ||||
| -rw-r--r-- | chrome/app/chrome_breakpad_client.h | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc index 8c71bcd..cf9d0c7 100644 --- a/chrome/app/breakpad_linux.cc +++ b/chrome/app/breakpad_linux.cc @@ -49,7 +49,6 @@ #include "base/android/build_info.h" #include "base/android/path_utils.h" -#include "chrome/common/descriptors_android.h" #endif #include "third_party/lss/linux_syscall_support.h" @@ -1703,7 +1702,7 @@ void InitNonBrowserCrashReporterForAndroid() { // generated as the renderer and browser run with different UIDs // (preventing the browser from inspecting the renderer process). int minidump_fd = base::GlobalDescriptors::GetInstance()-> - MaybeGet(kAndroidMinidumpDescriptor); + MaybeGet(breakpad::GetBreakpadClient()->GetAndroidMinidumpDescriptor()); if (minidump_fd == base::kInvalidPlatformFileValue) { NOTREACHED() << "Could not find minidump FD, crash reporting disabled."; } else { diff --git a/chrome/app/chrome_breakpad_client.cc b/chrome/app/chrome_breakpad_client.cc index 2182a3c..0bbac69 100644 --- a/chrome/app/chrome_breakpad_client.cc +++ b/chrome/app/chrome_breakpad_client.cc @@ -39,6 +39,10 @@ #include "chrome/installer/util/google_update_settings.h" #endif +#if defined(OS_ANDROID) +#include "chrome/common/descriptors_android.h" +#endif + namespace chrome { namespace { @@ -244,4 +248,10 @@ bool ChromeBreakpadClient::GetCollectStatsConsent() { } #endif +#if defined(OS_ANDROID) +int ChromeBreakpadClient::GetAndroidMinidumpDescriptor() { + return kAndroidMinidumpDescriptor; +} +#endif + } // namespace chrome diff --git a/chrome/app/chrome_breakpad_client.h b/chrome/app/chrome_breakpad_client.h index eb7f8d4..b11c6f0 100644 --- a/chrome/app/chrome_breakpad_client.h +++ b/chrome/app/chrome_breakpad_client.h @@ -56,6 +56,10 @@ class ChromeBreakpadClient : public breakpad::BreakpadClient { virtual bool GetCollectStatsConsent() OVERRIDE; #endif +#if defined(OS_ANDROID) + virtual int GetAndroidMinidumpDescriptor() OVERRIDE; +#endif + private: DISALLOW_COPY_AND_ASSIGN(ChromeBreakpadClient); }; |