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..3029936b5d521c34a4ee72a5e6399202274335b5 100644 |
--- a/chrome/browser/hang_monitor/hung_plugin_action.cc |
+++ b/chrome/browser/hang_monitor/hung_plugin_action.cc |
@@ -123,11 +123,11 @@ bool HungPluginAction::OnHungWindowDetected(HWND hung_window, |
// exists. The property is deleted if the window becomes |
// responsive. |
continue_hang_detection = false; |
-#pragma warning(disable:4311) |
+#pragma warning(disable : 4311 4302) |
Nico
2015/11/16 21:31:07
should these warning pragmas have a comment that e
brucedawson
2015/11/17 00:24:39
Yes. I copied over the warning from the previous f
Nico
2015/11/17 00:30:27
Hm, this now says that it's a truncation, but not
brucedawson
2015/11/18 01:58:11
Okay, better fix now. TetProp/GetProp take/return
|
int child_window_message_timeout = |
reinterpret_cast<int>(GetProp( |
hung_window, HungWindowDetector::kHungChildWindowTimeout)); |
-#pragma warning(default:4311) |
+#pragma warning(default : 4311 4302) |
if (child_window_message_timeout) { |
child_window_message_timeout *= 2; |
#pragma warning(disable:4312) |