| Index: chrome/browser/hang_monitor/hung_plugin_action.cc
|
| diff --git a/chrome/browser/hang_monitor/hung_plugin_action.cc b/chrome/browser/hang_monitor/hung_plugin_action.cc
|
| index 82142862ab0ad00c4cb6474dd4647c88ecf825b0..feff61d952d79b1007c4aabe67327bce74a6f86c 100644
|
| --- a/chrome/browser/hang_monitor/hung_plugin_action.cc
|
| +++ b/chrome/browser/hang_monitor/hung_plugin_action.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/metrics/histogram.h"
|
| #include "base/version.h"
|
| +#include "base/win/win_util.h"
|
| #include "chrome/browser/ui/simple_message_box.h"
|
| #include "chrome/common/logging_chrome.h"
|
| #include "chrome/grit/generated_resources.h"
|
| @@ -123,11 +124,8 @@ bool HungPluginAction::OnHungWindowDetected(HWND hung_window,
|
| // exists. The property is deleted if the window becomes
|
| // responsive.
|
| continue_hang_detection = false;
|
| -#pragma warning(disable:4311)
|
| - int child_window_message_timeout =
|
| - reinterpret_cast<int>(GetProp(
|
| - hung_window, HungWindowDetector::kHungChildWindowTimeout));
|
| -#pragma warning(default:4311)
|
| + int child_window_message_timeout = base::win::HandleToUint32(
|
| + GetProp(hung_window, HungWindowDetector::kHungChildWindowTimeout));
|
| if (child_window_message_timeout) {
|
| child_window_message_timeout *= 2;
|
| #pragma warning(disable:4312)
|
|
|