From ffa3a37b80dcfe1390d206738fb12d48b1d89f87 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Fri, 18 Mar 2011 02:55:50 +0000 Subject: Linux: Fix official build. BUG=none TEST=none TBR=jam Review URL: http://codereview.chromium.org/6713026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78659 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/breakpad_linux.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/app') diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc index 1f8905a..f51c137 100644 --- a/chrome/app/breakpad_linux.cc +++ b/chrome/app/breakpad_linux.cc @@ -32,11 +32,11 @@ #include "breakpad/src/common/linux/linux_libc_support.h" #include "breakpad/src/common/memory.h" #include "chrome/common/child_process_logging.h" -#include "chrome/common/chrome_descriptors.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info_posix.h" #include "chrome/common/env_vars.h" +#include "content/common/chrome_descriptors.h" #include "seccompsandbox/linux_syscall_support.h" // Some versions of gcc are prone to warn about unused return values. In cases @@ -163,8 +163,6 @@ class MimeWriter { } private: - DISALLOW_COPY_AND_ASSIGN(MimeWriter); - void AddItem(const void* base, size_t size); // Minor performance trade-off for easier-to-maintain code. void AddString(const char* str) { @@ -178,6 +176,8 @@ class MimeWriter { int fd_; const char* const mime_boundary_; + + DISALLOW_COPY_AND_ASSIGN(MimeWriter); }; MimeWriter::MimeWriter(int fd, const char* const mime_boundary) @@ -265,7 +265,7 @@ void MimeWriter::AddItem(const void* base, size_t size) { ++iov_index_; } -} // namespace +} // namespace pid_t HandleCrashDump(const BreakpadInfo& info) { // WARNING: this code runs in a compromised context. It may not call into -- cgit v1.1