diff options
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/chrome_browser_main.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chrome_browser_main_x11.cc | 4 | ||||
-rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 10 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/wizard_controller.cc | 2 | ||||
-rw-r--r-- | chrome/browser/crash_handler_host_linux.cc (renamed from chrome/browser/crash_handler_host_linuxish.cc) | 21 | ||||
-rw-r--r-- | chrome/browser/crash_handler_host_linux.h (renamed from chrome/browser/crash_handler_host_linuxish.h) | 16 | ||||
-rw-r--r-- | chrome/browser/crash_handler_host_linux_stub.cc (renamed from chrome/browser/crash_handler_host_linuxish_stub.cc) | 4 | ||||
-rw-r--r-- | chrome/browser/ui/gtk/first_run_dialog.cc | 2 |
8 files changed, 27 insertions, 34 deletions
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 533df74..23dfae0 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -124,7 +124,7 @@ #if defined(USE_LINUX_BREAKPAD) #include "base/linux_util.h" -#include "chrome/app/breakpad_linuxish.h" +#include "chrome/app/breakpad_linux.h" #endif #if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/chrome/browser/chrome_browser_main_x11.cc b/chrome/browser/chrome_browser_main_x11.cc index fbd832f..55968ca 100644 --- a/chrome/browser/chrome_browser_main_x11.cc +++ b/chrome/browser/chrome_browser_main_x11.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,7 +15,7 @@ #include "ui/base/x/x11_util_internal.h" #if defined(USE_LINUX_BREAKPAD) -#include "chrome/app/breakpad_linuxish.h" +#include "chrome/app/breakpad_linux.h" #endif using content::BrowserThread; diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index b11823e..d6c8557 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -135,9 +135,9 @@ #include "chrome/browser/chrome_browser_main_extra_parts_ash.h" #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_OPENBSD) #include "base/linux_util.h" -#include "chrome/browser/crash_handler_host_linuxish.h" +#include "chrome/browser/crash_handler_host_linux.h" #endif #if defined(TOOLKIT_GTK) @@ -1611,6 +1611,11 @@ bool ChromeContentBrowserClient::AllowSocketAPI( #if defined(OS_POSIX) && !defined(OS_MACOSX) int ChromeContentBrowserClient::GetCrashSignalFD( const CommandLine& command_line) { +#if defined(OS_ANDROID) + // TODO(carlosvaldivia): Upstream breakpad code for Android and remove this + // fork. http://crbug.com/113560 + NOTIMPLEMENTED(); +#else if (command_line.HasSwitch(switches::kExtensionProcess)) { ExtensionCrashHandlerHostLinux* crash_handler = ExtensionCrashHandlerHostLinux::GetInstance(); @@ -1631,6 +1636,7 @@ int ChromeContentBrowserClient::GetCrashSignalFD( if (process_type == switches::kGpuProcess) return GpuCrashHandlerHostLinux::GetInstance()->GetDeathSignalSocket(); +#endif // defined(OS_ANDROID) return -1; } diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index 075e016..d308b30 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -50,7 +50,7 @@ #include "ui/base/l10n/l10n_util.h" #if defined(USE_LINUX_BREAKPAD) -#include "chrome/app/breakpad_linuxish.h" +#include "chrome/app/breakpad_linux.h" #endif using content::BrowserThread; diff --git a/chrome/browser/crash_handler_host_linuxish.cc b/chrome/browser/crash_handler_host_linux.cc index 75fb872..c385406 100644 --- a/chrome/browser/crash_handler_host_linuxish.cc +++ b/chrome/browser/crash_handler_host_linux.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/crash_handler_host_linuxish.h" +#include "chrome/browser/crash_handler_host_linux.h" #include <stdint.h> #include <stdlib.h> @@ -27,17 +27,11 @@ #include "breakpad/src/client/linux/handler/exception_handler.h" #include "breakpad/src/client/linux/minidump_writer/linux_dumper.h" #include "breakpad/src/client/linux/minidump_writer/minidump_writer.h" -#include "chrome/app/breakpad_linuxish.h" +#include "chrome/app/breakpad_linux.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/env_vars.h" #include "content/public/browser/browser_thread.h" -#if defined(OS_ANDROID) -#include <sys/linux-syscalls.h> - -#define SYS_read __NR_read -#endif - using content::BrowserThread; using google_breakpad::ExceptionHandler; @@ -324,12 +318,8 @@ void CrashHandlerHostLinux::OnFileCanReadWithoutBlocking(int fd) { info->distro_length = strlen(distro); info->distro = distro; -#if defined(OS_ANDROID) - // Nothing gets uploaded in android. - info->upload = false; -#else + info->upload = (getenv(env_vars::kHeadless) == NULL); -#endif info->process_start_time = uptime; info->oom_size = oom_size; @@ -367,13 +357,10 @@ void CrashHandlerHostLinux::WriteDumpFile(BreakpadInfo* info, delete[] crash_context; // Freed in CrashDumpTask(); - unsigned minidump_filename_str_len = minidump_filename.length() + 1; - char* minidump_filename_str = new char[minidump_filename_str_len]; + char* minidump_filename_str = new char[minidump_filename.length() + 1]; minidump_filename.copy(minidump_filename_str, minidump_filename.length()); minidump_filename_str[minidump_filename.length()] = '\0'; info->filename = minidump_filename_str; - info->filename_length = minidump_filename_str_len; - info->pid = crashing_pid; BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, diff --git a/chrome/browser/crash_handler_host_linuxish.h b/chrome/browser/crash_handler_host_linux.h index 80c06d9..55ef624 100644 --- a/chrome/browser/crash_handler_host_linuxish.h +++ b/chrome/browser/crash_handler_host_linux.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CRASH_HANDLER_HOST_LINUXISH_H_ -#define CHROME_BROWSER_CRASH_HANDLER_HOST_LINUXISH_H_ +#ifndef CHROME_BROWSER_CRASH_HANDLER_HOST_LINUX_H_ +#define CHROME_BROWSER_CRASH_HANDLER_HOST_LINUX_H_ #pragma once #include "base/compiler_specific.h" @@ -26,11 +26,11 @@ class Thread; template <typename T> struct DefaultSingletonTraits; // This is the base class for singleton objects which crash dump renderers and -// plugins on Linux or Android. We perform the crash dump from the browser -// because it allows us to be outside the sandbox. +// plugins on Linux. We perform the crash dump from the browser because it +// allows us to be outside the sandbox. // -// PluginCrashHandlerHostLinux and RendererCrashHandlerHostLinux are -// singletons that handle plugin and renderer crashes, respectively. +// PluginCrashHandlerHostLinux and RendererCrashHandlerHostLinux are singletons +// that handle plugin and renderer crashes, respectively. // // Processes signal that they need to be dumped by sending a datagram over a // UNIX domain socket. All processes of the same type share the client end of @@ -181,4 +181,4 @@ class RendererCrashHandlerHostLinux : public CrashHandlerHostLinux { DISALLOW_COPY_AND_ASSIGN(RendererCrashHandlerHostLinux); }; -#endif // CHROME_BROWSER_CRASH_HANDLER_HOST_LINUXISH_H_ +#endif // CHROME_BROWSER_CRASH_HANDLER_HOST_LINUX_H_ diff --git a/chrome/browser/crash_handler_host_linuxish_stub.cc b/chrome/browser/crash_handler_host_linux_stub.cc index 8101c8f..8685846 100644 --- a/chrome/browser/crash_handler_host_linuxish_stub.cc +++ b/chrome/browser/crash_handler_host_linux_stub.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // This is a stub file which is compiled in when we are building without // breakpad support. -#include "chrome/browser/crash_handler_host_linuxish.h" +#include "chrome/browser/crash_handler_host_linux.h" #include "base/memory/singleton.h" diff --git a/chrome/browser/ui/gtk/first_run_dialog.cc b/chrome/browser/ui/gtk/first_run_dialog.cc index ddbbeff..f91b3d9 100644 --- a/chrome/browser/ui/gtk/first_run_dialog.cc +++ b/chrome/browser/ui/gtk/first_run_dialog.cc @@ -29,7 +29,7 @@ #include "ui/base/resource/resource_bundle.h" #if defined(USE_LINUX_BREAKPAD) -#include "chrome/app/breakpad_linuxish.h" +#include "chrome/app/breakpad_linux.h" #endif #if defined(GOOGLE_CHROME_BUILD) |