diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-18 02:55:50 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-18 02:55:50 +0000 |
| commit | ffa3a37b80dcfe1390d206738fb12d48b1d89f87 (patch) | |
| tree | a5cc48ab501d0f6bb21ffb0d02815e858c3d9fdc /chrome/app | |
| parent | 23597f5e5d09dafee636172492b1897f9adc3c69 (diff) | |
| download | chromium_src-ffa3a37b80dcfe1390d206738fb12d48b1d89f87.zip chromium_src-ffa3a37b80dcfe1390d206738fb12d48b1d89f87.tar.gz chromium_src-ffa3a37b80dcfe1390d206738fb12d48b1d89f87.tar.bz2 | |
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
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/breakpad_linux.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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 |