diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
| commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
| tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/content/child/child_process.cc | |
| parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) | |
| download | qtwebengine-chromium-ab0a50979b9eb4dfa3320eff7e187e41efedf7a9.tar.gz | |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/content/child/child_process.cc')
| -rw-r--r-- | chromium/content/child/child_process.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/content/child/child_process.cc b/chromium/content/child/child_process.cc index 837ab02c717..42eff930af4 100644 --- a/chromium/content/child/child_process.cc +++ b/chromium/content/child/child_process.cc @@ -69,6 +69,7 @@ ChildProcess::~ChildProcess() { } g_lazy_tls.Pointer()->Set(NULL); + io_thread_.Stop(); } ChildThread* ChildProcess::main_thread() { @@ -116,7 +117,8 @@ void ChildProcess::WaitForDebugger(const std::string& label) { std::string message = label; message += " starting with pid: "; message += base::IntToString(base::GetCurrentProcId()); - ::MessageBox(NULL, UTF8ToWide(message).c_str(), UTF8ToWide(title).c_str(), + ::MessageBox(NULL, base::UTF8ToWide(message).c_str(), + base::UTF8ToWide(title).c_str(), MB_OK | MB_SETFOREGROUND); #elif defined(OS_POSIX) #if defined(OS_ANDROID) |