| 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..72b8c5d459560ac0e9a8daa29be3ffb2dc300a76 100644
|
| --- a/chrome/browser/hang_monitor/hung_window_detector.cc
|
| +++ b/chrome/browser/hang_monitor/hung_window_detector.cc
|
| @@ -88,10 +88,10 @@ 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)
|
| +#pragma warning(disable : 4311 4302)
|
| int child_window_message_timeout =
|
| reinterpret_cast<int>(GetProp(child_window, kHungChildWindowTimeout));
|
| -#pragma warning(default:4311)
|
| +#pragma warning(default : 4311 4302)
|
| if (!child_window_message_timeout) {
|
| child_window_message_timeout = message_response_timeout_;
|
| }
|
|
|