diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/content/child/child_process.cc | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/content/child/child_process.cc')
| -rw-r--r-- | chromium/content/child/child_process.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/content/child/child_process.cc b/chromium/content/child/child_process.cc index 01675b321f7..7cd842377c0 100644 --- a/chromium/content/child/child_process.cc +++ b/chromium/content/child/child_process.cc @@ -4,9 +4,7 @@ #include "content/child/child_process.h" -#if defined(OS_POSIX) && !defined(OS_ANDROID) -#include <signal.h> // For SigUSR1Handler below. -#endif +#include <string.h> #include "base/lazy_instance.h" #include "base/message_loop/message_loop.h" @@ -16,6 +14,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h" #include "base/threading/thread_local.h" +#include "build/build_config.h" #include "content/child/child_thread_impl.h" #if defined(OS_ANDROID) @@ -23,6 +22,7 @@ #endif #if defined(OS_POSIX) && !defined(OS_ANDROID) +#include <signal.h> static void SigUSR1Handler(int signal) { } #endif @@ -123,7 +123,7 @@ void ChildProcess::WaitForDebugger(const std::string& label) { #if defined(OS_ANDROID) LOG(ERROR) << label << " waiting for GDB."; // Wait 24 hours for a debugger to be attached to the current process. - base::debug::WaitForDebugger(24 * 60 * 60, false); + base::debug::WaitForDebugger(24 * 60 * 60, true); #else // TODO(playmobil): In the long term, overriding this flag doesn't seem // right, either use our own flag or open a dialog we can use. |