| Index: chrome/browser/ui/hung_plugin_tab_helper.cc
|
| ===================================================================
|
| --- chrome/browser/ui/hung_plugin_tab_helper.cc (revision 134453)
|
| +++ chrome/browser/ui/hung_plugin_tab_helper.cc (working copy)
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/process_util.h"
|
| -#include "build/build_config.h"
|
| #include "chrome/browser/infobars/infobar_tab_helper.h"
|
| #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| @@ -22,10 +21,6 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| -#if defined(OS_WIN)
|
| -#include "chrome/browser/hang_monitor/hang_crash_dump_win.h"
|
| -#endif
|
| -
|
| namespace {
|
|
|
| // Delay in seconds before re-showing the hung plugin message. This will be
|
| @@ -45,11 +40,10 @@
|
| while (!iter.Done()) {
|
| const content::ChildProcessData& data = iter.GetData();
|
| if (data.id == child_id) {
|
| -#if defined(OS_WIN)
|
| - CrashDumpAndTerminateHungChildProcess(data.handle);
|
| -#else
|
| + // TODO(brettw) bug 123021: it might be nice to do some stuff to capture
|
| + // a stack. The NPAPI Windows hang monitor does some cool stuff in
|
| + // hung_window_detector.cc.
|
| base::KillProcess(data.handle, content::RESULT_CODE_HUNG, false);
|
| -#endif
|
| break;
|
| }
|
| ++iter;
|
|
|