Index: chrome/browser/hang_monitor/hung_window_detector.cc |
diff --git a/chrome/browser/hang_monitor/hung_window_detector.cc b/chrome/browser/hang_monitor/hung_window_detector.cc |
index d58e36a47cfb6976f9fc537c9babda723e0c161d..616f7ffa145b49fb8b54e13e76dabc14aa091bd1 100644 |
--- a/chrome/browser/hang_monitor/hung_window_detector.cc |
+++ b/chrome/browser/hang_monitor/hung_window_detector.cc |
@@ -11,6 +11,10 @@ |
#include "chrome/browser/hang_monitor/hang_crash_dump_win.h" |
#include "content/public/common/result_codes.h" |
+#if defined(OS_WIN) |
+#include "base/win/win_util.h" |
ananta
2015/11/18 19:13:42
Remove the OS_WIN ifdef.
|
+#endif |
+ |
const wchar_t HungWindowDetector::kHungChildWindowTimeout[] = |
L"Chrome_HungChildWindowTimeout"; |
@@ -88,10 +92,8 @@ bool HungWindowDetector::CheckChildWindow(HWND child_window) { |
// The message timeout for a child window starts of with a default |
// value specified by the message_response_timeout_ member. It is |
// tracked by a property on the child window. |
-#pragma warning(disable:4311) |
- int child_window_message_timeout = |
- reinterpret_cast<int>(GetProp(child_window, kHungChildWindowTimeout)); |
-#pragma warning(default:4311) |
+ int child_window_message_timeout = base::win::HandleToUint32( |
+ GetProp(child_window, kHungChildWindowTimeout)); |
if (!child_window_message_timeout) { |
child_window_message_timeout = message_response_timeout_; |
} |